diff options
| author | Kristian Monsen <kristianm@google.com> | 2011-07-07 15:38:18 +0100 |
|---|---|---|
| committer | Kristian Monsen <kristianm@google.com> | 2011-07-07 17:20:23 +0100 |
| commit | ebf2dce03f8bdd209dc0aaae609cd6bad8686345 (patch) | |
| tree | 9d2bdda0210107bcdd2d4b6a204ee5acf122709d | |
| parent | 26c172852dc47910de9850e9e4b6d46687c1d1f0 (diff) | |
| download | external_webkit-ebf2dce03f8bdd209dc0aaae609cd6bad8686345.zip external_webkit-ebf2dce03f8bdd209dc0aaae609cd6bad8686345.tar.gz external_webkit-ebf2dce03f8bdd209dc0aaae609cd6bad8686345.tar.bz2 | |
Merge Chromium at r12.0.742.93: Updating include paths
chromium CL:
http://codereview.chromium.org/6714032
Also fix another orderding when I was there.
Change-Id: Ie3d53bc3816760f8f0d1a41c5d458968c35afc80
| -rw-r--r-- | Source/WebKit/android/WebCoreSupport/ChromiumIncludes.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Source/WebKit/android/WebCoreSupport/ChromiumIncludes.h b/Source/WebKit/android/WebCoreSupport/ChromiumIncludes.h index 670b307..dac555f 100644 --- a/Source/WebKit/android/WebCoreSupport/ChromiumIncludes.h +++ b/Source/WebKit/android/WebCoreSupport/ChromiumIncludes.h @@ -47,12 +47,12 @@ #include <android/net/android_network_library_impl.h> #include <base/callback.h> -#include <base/synchronization/lock.h> +#include <base/memory/ref_counted.h> #include <base/message_loop_proxy.h> #include <base/openssl_util.h> -#include <base/ref_counted.h> #include <base/string_util.h> #include <base/synchronization/condition_variable.h> +#include <base/synchronization/lock.h> #include <base/sys_string_conversions.h> #include <base/threading/thread.h> #include <base/time.h> @@ -86,7 +86,7 @@ #include <autofill/autofill_profile.h> #include <autofill/personal_data_manager.h> #include <base/logging.h> -#include <base/scoped_vector.h> +#include <base/memory/scoped_vector.h> #include <base/string16.h> #include <base/utf_string_conversions.h> #include <chrome/browser/autofill/autofill_host.h> |