diff options
| author | Ben Murdoch <benm@google.com> | 2010-11-18 19:36:48 +0000 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2010-11-19 14:53:22 +0000 |
| commit | 595099a8c1be642bb6603f1b82669d721fe5d5df (patch) | |
| tree | f547aa2fe072dc76a2025ca8953ee6907ebb6f4c /android | |
| parent | dca1fda5df8a49398dc98c4f6e4a0a1505662dc2 (diff) | |
| download | external_chromium-595099a8c1be642bb6603f1b82669d721fe5d5df.zip external_chromium-595099a8c1be642bb6603f1b82669d721fe5d5df.tar.gz external_chromium-595099a8c1be642bb6603f1b82669d721fe5d5df.tar.bz2 | |
Merge Chromium at r65505: GetIOMessageLoopProxy now const
http://src.chromium.org/viewvc/chrome?view=rev&revision=63574
Change-Id: I7e81d58e8d3476c135d45610de6a615bf1eee667
Diffstat (limited to 'android')
| -rw-r--r-- | android/autofill/android_url_request_context_getter.cc | 2 | ||||
| -rw-r--r-- | android/autofill/android_url_request_context_getter.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/android/autofill/android_url_request_context_getter.cc b/android/autofill/android_url_request_context_getter.cc index 8db1927..9e602cb 100644 --- a/android/autofill/android_url_request_context_getter.cc +++ b/android/autofill/android_url_request_context_getter.cc @@ -33,7 +33,7 @@ URLRequestContext* AndroidURLRequestContextGetter::GetURLRequestContext() return (*context_getter_function_)(); } -scoped_refptr<base::MessageLoopProxy> AndroidURLRequestContextGetter::GetIOMessageLoopProxy() +scoped_refptr<base::MessageLoopProxy> AndroidURLRequestContextGetter::GetIOMessageLoopProxy() const { if (!io_thread_) return NULL; diff --git a/android/autofill/android_url_request_context_getter.h b/android/autofill/android_url_request_context_getter.h index d4cd4ed..116323d 100644 --- a/android/autofill/android_url_request_context_getter.h +++ b/android/autofill/android_url_request_context_getter.h @@ -40,7 +40,7 @@ public: // URLRequestContextGetter implementation virtual URLRequestContext* GetURLRequestContext(); - virtual scoped_refptr<base::MessageLoopProxy> GetIOMessageLoopProxy(); + virtual scoped_refptr<base::MessageLoopProxy> GetIOMessageLoopProxy() const; static AndroidURLRequestContextGetter* Get(); @@ -52,7 +52,7 @@ public: private: static scoped_refptr<AndroidURLRequestContextGetter> instance_; URLRequestContextGetterFunction* context_getter_function_; - base::Thread* io_thread_; + mutable base::Thread* io_thread_; }; #endif // ANDROID_URL_REQUEST_CONTEXT_GETTER_H |