diff options
| author | Kristian Monsen <kristianm@google.com> | 2011-06-21 20:29:35 +0100 |
|---|---|---|
| committer | Kristian Monsen <kristianm@google.com> | 2011-06-30 13:29:14 +0100 |
| commit | 51f5de21d001cc78ae017283399a58c0c1c9b974 (patch) | |
| tree | 7f64c9dc588c1e1d8c0ef1c52466edf4648e7636 /chrome | |
| parent | eb20993dfc50d111c22a1c732ae91ea63a1d46a5 (diff) | |
| download | external_chromium-51f5de21d001cc78ae017283399a58c0c1c9b974.zip external_chromium-51f5de21d001cc78ae017283399a58c0c1c9b974.tar.gz external_chromium-51f5de21d001cc78ae017283399a58c0c1c9b974.tar.bz2 | |
Merge Chromium at r11.0.696.0: Compile fixes, removing dependencies on new content directory
Also using TabContentsObserver since we now have that in
Android.
Change-Id: I430a5f5ac67630b0164a07e27a686f472a725d58
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/browser/autofill/autofill_manager.cc | 6 | ||||
| -rw-r--r-- | chrome/browser/autofill/autofill_manager.h | 7 | ||||
| -rw-r--r-- | chrome/browser/autofill/personal_data_manager.cc | 2 |
3 files changed, 9 insertions, 6 deletions
diff --git a/chrome/browser/autofill/autofill_manager.cc b/chrome/browser/autofill/autofill_manager.cc index 2d7e56a..8cf9314 100644 --- a/chrome/browser/autofill/autofill_manager.cc +++ b/chrome/browser/autofill/autofill_manager.cc @@ -24,13 +24,19 @@ #include "chrome/browser/autofill/select_control_handler.h" #include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" +#ifndef ANDROID #include "chrome/browser/ui/browser_list.h" +#endif +#ifndef ANDROID #include "chrome/common/autofill_messages.h" #include "chrome/common/chrome_switches.h" +#endif #include "chrome/common/guid.h" +#ifndef ANDROID #include "chrome/common/notification_details.h" #include "chrome/common/notification_service.h" #include "chrome/common/notification_type.h" +#endif #include "chrome/common/pref_names.h" #include "chrome/common/url_constants.h" #ifndef ANDROID diff --git a/chrome/browser/autofill/autofill_manager.h b/chrome/browser/autofill/autofill_manager.h index 8d16fdc..d477386 100644 --- a/chrome/browser/autofill/autofill_manager.h +++ b/chrome/browser/autofill/autofill_manager.h @@ -16,9 +16,7 @@ #include "chrome/browser/autofill/autofill_dialog.h" #include "chrome/browser/autofill/autofill_download.h" #include "chrome/browser/autofill/personal_data_manager.h" -#ifndef ANDROID #include "content/browser/tab_contents/tab_contents_observer.h" -#endif #ifndef ANDROID class AutoFillCCInfoBarDelegate; @@ -42,10 +40,7 @@ class FormField; // Manages saving and restoring the user's personal information entered into web // forms. -class AutofillManager : -#ifndef ANDROID - public TabContentsObserver, -#endif +class AutofillManager : public TabContentsObserver, public AutofillDownloadManager::Observer { public: explicit AutofillManager(TabContents* tab_contents); diff --git a/chrome/browser/autofill/personal_data_manager.cc b/chrome/browser/autofill/personal_data_manager.cc index 76ff96d..1c35bbf 100644 --- a/chrome/browser/autofill/personal_data_manager.cc +++ b/chrome/browser/autofill/personal_data_manager.cc @@ -19,7 +19,9 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/browser/webdata/web_data_service.h" #include "chrome/common/pref_names.h" +#ifndef ANDROID #include "content/browser/browser_thread.h" +#endif #include "third_party/WebKit/Source/WebKit/chromium/public/WebRegularExpression.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebString.h" |