diff options
author | Kristian Monsen <kristianm@google.com> | 2011-07-05 21:24:01 +0100 |
---|---|---|
committer | Kristian Monsen <kristianm@google.com> | 2011-07-08 18:49:51 +0100 |
commit | cfb4826edae011aed657a813297687800ed85e17 (patch) | |
tree | e1ab4eb17b5308084438d3e6b04e042b5bf66682 /android | |
parent | d26447072f93114b19c75ae32e18a68487125c0c (diff) | |
download | external_chromium-cfb4826edae011aed657a813297687800ed85e17.zip external_chromium-cfb4826edae011aed657a813297687800ed85e17.tar.gz external_chromium-cfb4826edae011aed657a813297687800ed85e17.tar.bz2 |
Merge Chromium at r12.0.742.93: All autofill fixes
URLRequestContextGetter moved to net and the net
namespace, http://codereview.chromium.org/6778025:
profile_android.cc
profile_android.h
autofill_download.cc
Files moved from base/ to base/memory,
http://codereview.chromium.org/6714032:
profile_android.h
New functions in profile.h:
http://src.chromium.org/viewvc/chrome/branches/742/src/chrome/browser/profiles/profile.h?view=diff&pathrev=88489&r1=78300&r2=78301
http://src.chromium.org/viewvc/chrome/branches/742/src/chrome/browser/profiles/profile.h?view=diff&pathrev=88489&r1=81769&r2=81770
profile_android.h
autofill_country.cc: Removed code where we had
local changes:
http://src.chromium.org/viewvc/chrome/branches/742/src/chrome/browser/autofill/autofill_country.cc?r1=77402&r2=77780&pathrev=88489
AutoFill -> Autofill renaming:
autofill_download.cc
autofill_manager.cc
autofill_manager.h
personal_data_manager.cc
credit_card.cc
Method with local change removed upstream, part of
the removed code added to an existing method.
http://codereview.chromium.org/6690038
autofill_manager.cc
Using TabContentsWrapper:
http://src.chromium.org/viewvc/chrome/branches/742/src/chrome/browser/autofill/autofill_manager.cc?view=diff&pathrev=88489&r1=79171&r2=79172
OnShowAutofillDialog is ifdef out by Android, so
taking upstream.
IsAutofillEnabled, Android has just ifdef return true, so taking upstream.
Change-Id: I87bfd814592aaed074d00716df355fba7be3984d
Diffstat (limited to 'android')
-rw-r--r-- | android/autofill/profile_android.cc | 2 | ||||
-rw-r--r-- | android/autofill/profile_android.h | 18 |
2 files changed, 12 insertions, 8 deletions
diff --git a/android/autofill/profile_android.cc b/android/autofill/profile_android.cc index 86f93bc..92e8ec0 100644 --- a/android/autofill/profile_android.cc +++ b/android/autofill/profile_android.cc @@ -67,7 +67,7 @@ PrefService* ProfileImplAndroid::GetPrefs() { return NULL; } -URLRequestContextGetter* ProfileImplAndroid::GetRequestContext() { +net::URLRequestContextGetter* ProfileImplAndroid::GetRequestContext() { return url_request_context_getter_.get(); } diff --git a/android/autofill/profile_android.h b/android/autofill/profile_android.h index 0b4473d..c690735 100644 --- a/android/autofill/profile_android.h +++ b/android/autofill/profile_android.h @@ -33,7 +33,7 @@ #include "android/autofill/android_url_request_context_getter.h" #include "base/basictypes.h" #include "base/file_path.h" -#include "base/ref_counted.h" +#include "base/memory/ref_counted.h" #include "base/scoped_ptr.h" #include "base/timer.h" #include "chrome/browser/prefs/pref_service.h" @@ -126,14 +126,14 @@ class ProfileImplAndroid : public Profile { public: virtual ~ProfileImplAndroid(); - void SetRequestContext(URLRequestContextGetter* context) { url_request_context_getter_ = context; } + void SetRequestContext(net::URLRequestContextGetter* context) { url_request_context_getter_ = context; } // Profile implementation. virtual Profile* GetOriginalProfile(); virtual PersonalDataManager* GetPersonalDataManager(); virtual PrefService* GetPrefs(); virtual FilePath GetPath() { return path_; } - virtual URLRequestContextGetter* GetRequestContext(); + virtual net::URLRequestContextGetter* GetRequestContext(); // Functions from Profile that we don't need on Android for AutoFill. virtual ProfileId GetRuntimeId() { NOTREACHED(); return 0; } @@ -179,8 +179,8 @@ class ProfileImplAndroid : public Profile { virtual const Extension* GetTheme() { NOTREACHED(); return NULL; } virtual BrowserThemeProvider* GetThemeProvider() { NOTREACHED(); return NULL; } virtual bool HasCreatedDownloadManager() const { NOTREACHED(); return false; } - virtual URLRequestContextGetter* GetRequestContextForMedia() { NOTREACHED(); return NULL; } - virtual URLRequestContextGetter* GetRequestContextForExtensions() { NOTREACHED(); return NULL; } + virtual net::URLRequestContextGetter* GetRequestContextForMedia() { NOTREACHED(); return NULL; } + virtual net::URLRequestContextGetter* GetRequestContextForExtensions() { NOTREACHED(); return NULL; } virtual void RegisterExtensionWithRequestContexts(const Extension* extension) { NOTREACHED(); } virtual void UnregisterExtensionWithRequestContexts(const Extension* extension) { NOTREACHED(); } virtual net::SSLConfigService* GetSSLConfigService() { NOTREACHED(); return NULL; } @@ -206,7 +206,7 @@ class ProfileImplAndroid : public Profile { virtual BackgroundContentsService* GetBackgroundContentsService() const { NOTREACHED(); return NULL; } virtual StatusTray* GetStatusTray() { NOTREACHED(); return NULL; } virtual void MarkAsCleanShutdown() { NOTREACHED(); } - virtual void InitExtensions() { NOTREACHED(); } + virtual void InitExtensions(bool extensions_enabled) { NOTREACHED(); } virtual void InitWebResources() { NOTREACHED(); } virtual NTPResourceCache* GetNTPResourceCache() { NOTREACHED(); return NULL; } virtual FilePath last_selected_directory() { NOTREACHED(); return FilePath(""); } @@ -229,6 +229,10 @@ class ProfileImplAndroid : public Profile { virtual ChromeURLDataManager* GetChromeURLDataManager() { NOTREACHED(); return NULL; } virtual PrefProxyConfigTracker* GetProxyConfigTracker() { NOTREACHED(); return NULL; } virtual prerender::PrerenderManager* GetPrerenderManager() { NOTREACHED(); return NULL; } + virtual net::URLRequestContextGetter* GetRequestContextForPossibleApp( + const Extension* installed_app) { NOTREACHED(); return NULL; } + virtual net::URLRequestContextGetter* GetRequestContextForIsolatedApp( + const std::string& app_id) { NOTREACHED(); return NULL; } private: friend class Profile; @@ -253,7 +257,7 @@ class ProfileImplAndroid : public Profile { FilePath path_; scoped_ptr<PrefService> preferences_; scoped_refptr<PersonalDataManager> personal_data_; - scoped_refptr<URLRequestContextGetter> url_request_context_getter_; + scoped_refptr<net::URLRequestContextGetter> url_request_context_getter_; DISALLOW_COPY_AND_ASSIGN(ProfileImplAndroid); }; |