diff options
| author | Kristian Monsen <kristianm@google.com> | 2011-06-16 17:39:53 +0100 |
|---|---|---|
| committer | Kristian Monsen <kristianm@google.com> | 2011-06-29 17:03:34 +0100 |
| commit | e5757d9f5d659078c7e68329c5cd2c4b39c38668 (patch) | |
| tree | adb1e154edf0ec5aa5b645d2746b2e959efc06fe /chrome | |
| parent | 2b5362cbd7c1ad63d2c4a7405b7c9935265d0856 (diff) | |
| download | external_chromium-e5757d9f5d659078c7e68329c5cd2c4b39c38668.zip external_chromium-e5757d9f5d659078c7e68329c5cd2c4b39c38668.tar.gz external_chromium-e5757d9f5d659078c7e68329c5cd2c4b39c38668.tar.bz2 | |
Merge Chromium at r11.0.696.0: Fix conflict in web_data_service.h
Include moved upstream close to local edit:
http://src.chromium.org/viewvc/chrome/trunk/src/chrome/browser/webdata/web_data_service.h?view=diff&pathrev=77261&r1=76389&r2=76390
Change-Id: Ie7324aa01e70a66ce62ed0cca0f8b923c942c89f
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/browser/webdata/web_data_service.h | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/chrome/browser/webdata/web_data_service.h b/chrome/browser/webdata/web_data_service.h index 86cd309..3d2e41e 100644 --- a/chrome/browser/webdata/web_data_service.h +++ b/chrome/browser/webdata/web_data_service.h @@ -15,14 +15,13 @@ #include "base/ref_counted.h" #include "base/synchronization/lock.h" #include "chrome/browser/search_engines/template_url_id.h" -<<<<<<< HEAD +#ifndef ANDROID +#include "content/browser/browser_thread.h" +#endif #ifdef ANDROID #include "third_party/skia/include/core/SkBitmap.h" #include <WebCoreSupport/autofill/FormFieldAndroid.h> #else -======= -#include "content/browser/browser_thread.h" ->>>>>>> chromium.org at r11.0.696.0 #include "webkit/glue/form_field.h" #endif @@ -170,8 +169,11 @@ template <class T> class WDObjectResult : public WDTypedResult { class WebDataServiceConsumer; class WebDataService - : public base::RefCountedThreadSafe<WebDataService, - BrowserThread::DeleteOnUIThread> { + : public base::RefCountedThreadSafe<WebDataService +#ifndef ANDROID + , BrowserThread::DeleteOnUIThread +#endif + > { public: // All requests return an opaque handle of the following type. typedef int Handle; @@ -511,7 +513,9 @@ class WebDataService // ////////////////////////////////////////////////////////////////////////////// private: +#ifndef ANDROID friend struct BrowserThread::DeleteOnThread<BrowserThread::UI>; +#endif friend class DeleteTask<WebDataService>; friend class ShutdownTask; |