diff options
| author | rlp@chromium.org <rlp@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-10 23:52:59 +0000 |
|---|---|---|
| committer | rlp@chromium.org <rlp@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-10 23:52:59 +0000 |
| commit | 229217e10d395b756026a8986aa420457ffe0d60 (patch) | |
| tree | 840258e44f809cfce23106207252a6852af2659e /chrome/browser/profiles/profile.h | |
| parent | af78a80fa056da888c7a8bc08672998c0a09005e (diff) | |
| download | chromium_src-229217e10d395b756026a8986aa420457ffe0d60.zip chromium_src-229217e10d395b756026a8986aa420457ffe0d60.tar.gz chromium_src-229217e10d395b756026a8986aa420457ffe0d60.tar.bz2 | |
Revert 145969 - Removing last usage of default request context. Fixing up login_utils to not need it by adding a notification so that login_utils only accesses it when the request context getter has been initialized.
BUG=125292, 127693
TEST=unittest, manual
Review URL: https://chromiumcodereview.appspot.com/10657009
TBR=rlp@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10735042
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@145995 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/profiles/profile.h')
| -rw-r--r-- | chrome/browser/profiles/profile.h | 20 |
1 files changed, 17 insertions, 3 deletions
diff --git a/chrome/browser/profiles/profile.h b/chrome/browser/profiles/profile.h index 814e207..b4cc8d1 100644 --- a/chrome/browser/profiles/profile.h +++ b/chrome/browser/profiles/profile.h @@ -147,6 +147,12 @@ class Profile : public content::BrowserContext { // Returns the profile corresponding to the given WebUI. static Profile* FromWebUI(content::WebUI* web_ui); + // TODO(rlp): Please do not use this function. It is a temporary fix + // for M19 stable. See crbug.com/125292. + static net::URLRequestContextGetter* GetDefaultRequestContextDeprecated() { + return Profile::GetDefaultRequestContext(); + } + // content::BrowserContext implementation ------------------------------------ // Typesafe upcast. @@ -260,9 +266,6 @@ class Profile : public content::BrowserContext { // time that this method is called. virtual PrefService* GetOffTheRecordPrefs() = 0; - // Returns the main request context. - virtual net::URLRequestContextGetter* GetRequestContext() = 0; - // Returns the request context used for extension-related requests. This // is only used for a separate cookie store currently. virtual net::URLRequestContextGetter* GetRequestContextForExtensions() = 0; @@ -408,7 +411,18 @@ class Profile : public content::BrowserContext { virtual base::Callback<ChromeURLDataManagerBackend*(void)> GetChromeURLDataManagerBackendGetter() const = 0; + static net::URLRequestContextGetter* default_request_context_; + private: + // ***DEPRECATED**: You should be passing in the specific profile's + // URLRequestContextGetter or using the system URLRequestContextGetter. + // + // Returns the request context for the "default" profile. This may be called + // from any thread. This CAN return NULL if a first request context has not + // yet been created. If necessary, listen on the UI thread for + // NOTIFY_DEFAULT_REQUEST_CONTEXT_AVAILABLE. + static net::URLRequestContextGetter* GetDefaultRequestContext(); + bool restored_last_session_; // Accessibility events will only be propagated when the pause |