diff options
| author | Kristian Monsen <kristianm@google.com> | 2011-05-24 18:15:58 +0100 |
|---|---|---|
| committer | Kristian Monsen <kristianm@google.com> | 2011-05-25 14:13:32 +0100 |
| commit | 9aa5f8b435409e063e76e6e4f12f5c4e85997e0a (patch) | |
| tree | 574138578fb7507010d4db1c9f094b899a63f8c5 /android | |
| parent | 7375b0cf763978c2988cd0784818fbedd11ce85a (diff) | |
| download | external_chromium-9aa5f8b435409e063e76e6e4f12f5c4e85997e0a.zip external_chromium-9aa5f8b435409e063e76e6e4f12f5c4e85997e0a.tar.gz external_chromium-9aa5f8b435409e063e76e6e4f12f5c4e85997e0a.tar.bz2 | |
Merge Chromium at 10.0.634.0: Fix conflict and compile from thread.h move
thread.h was moved in this CL:
http://codereview.chromium.org/6028009
Change-Id: I19110c2c356d07b3e3bd5256161bec45c21c057f
Diffstat (limited to 'android')
| -rw-r--r-- | android/autofill/android_url_request_context_getter.h | 2 | ||||
| -rw-r--r-- | android/autofill/url_fetcher_proxy.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/android/autofill/android_url_request_context_getter.h b/android/autofill/android_url_request_context_getter.h index 80e9513..d47f792 100644 --- a/android/autofill/android_url_request_context_getter.h +++ b/android/autofill/android_url_request_context_getter.h @@ -27,7 +27,7 @@ #define ANDROID_URL_REQUEST_CONTEXT_GETTER_H #include "base/message_loop_proxy.h" -#include "base/thread.h" +#include "base/threading/thread.h" #include "common/net/url_request_context_getter.h" #include "net/url_request/url_request_context.h" diff --git a/android/autofill/url_fetcher_proxy.h b/android/autofill/url_fetcher_proxy.h index 19cabf3..201a269 100644 --- a/android/autofill/url_fetcher_proxy.h +++ b/android/autofill/url_fetcher_proxy.h @@ -28,7 +28,7 @@ #include "android/autofill/android_url_request_context_getter.h" #include "android/autofill/profile_android.h" #include "base/scoped_ptr.h" -#include "base/thread.h" +#include "base/threading/thread.h" #include "common/net/url_fetcher.h" #include "net/url_request/url_request_status.h" #include <WebCoreSupport/autofill/MainThreadProxy.h> |