Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(214)

Unified Diff: chrome/browser/profiles/profile.h

Issue 10735042: Revert 145969 - Removing last usage of default request context. Fixing up login_utils to not need i… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/chromeos/login/login_utils.cc ('k') | chrome/browser/profiles/profile.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/profiles/profile.h
===================================================================
--- chrome/browser/profiles/profile.h (revision 145994)
+++ chrome/browser/profiles/profile.h (working copy)
@@ -147,6 +147,12 @@
// 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 @@
// 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 @@
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
« no previous file with comments | « chrome/browser/chromeos/login/login_utils.cc ('k') | chrome/browser/profiles/profile.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698