diff options
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 |