diff options
author | sanjeevr@chromium.org <sanjeevr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-31 18:49:34 +0000 |
---|---|---|
committer | sanjeevr@chromium.org <sanjeevr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-31 18:49:34 +0000 |
commit | abe2c035dd58c29f9c5f00807e502baa2cc462bc (patch) | |
tree | 45c383ddc14968e16e050938f73456e13a3fe980 /chrome/browser/profiles/profile.cc | |
parent | 6cfef4d1548e36ecff926bdb148d9d497de4176c (diff) | |
download | chromium_src-abe2c035dd58c29f9c5f00807e502baa2cc462bc.zip chromium_src-abe2c035dd58c29f9c5f00807e502baa2cc462bc.tar.gz chromium_src-abe2c035dd58c29f9c5f00807e502baa2cc462bc.tar.bz2 |
Moved URLRequestContextGetter to net/ so it can be used by projects such as jingle.
BUG=None
TEST=Build.
Review URL: http://codereview.chromium.org/6778025
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@80033 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/profiles/profile.cc')
-rw-r--r-- | chrome/browser/profiles/profile.cc | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/chrome/browser/profiles/profile.cc b/chrome/browser/profiles/profile.cc index 8de86d8..a5b6996 100644 --- a/chrome/browser/profiles/profile.cc +++ b/chrome/browser/profiles/profile.cc @@ -75,7 +75,7 @@ using base::TimeDelta; // A pointer to the request context for the default profile. See comments on // Profile::GetDefaultRequestContext. -URLRequestContextGetter* Profile::default_request_context_; +net::URLRequestContextGetter* Profile::default_request_context_; namespace { @@ -129,7 +129,7 @@ void Profile::RegisterUserPrefs(PrefService* prefs) { } // static -URLRequestContextGetter* Profile::GetDefaultRequestContext() { +net::URLRequestContextGetter* Profile::GetDefaultRequestContext() { return default_request_context_; } @@ -403,11 +403,11 @@ class OffTheRecordProfileImpl : public Profile, return file_system_context_.get(); } - virtual URLRequestContextGetter* GetRequestContext() { + virtual net::URLRequestContextGetter* GetRequestContext() { return io_data_.GetMainRequestContextGetter(); } - virtual URLRequestContextGetter* GetRequestContextForPossibleApp( + virtual net::URLRequestContextGetter* GetRequestContextForPossibleApp( const Extension* installed_app) { if (CommandLine::ForCurrentProcess()->HasSwitch( switches::kEnableExperimentalAppManifests) && @@ -418,16 +418,16 @@ class OffTheRecordProfileImpl : public Profile, return GetRequestContext(); } - virtual URLRequestContextGetter* GetRequestContextForMedia() { + virtual net::URLRequestContextGetter* GetRequestContextForMedia() { // In OTR mode, media request context is the same as the original one. return io_data_.GetMainRequestContextGetter(); } - URLRequestContextGetter* GetRequestContextForExtensions() { + net::URLRequestContextGetter* GetRequestContextForExtensions() { return io_data_.GetExtensionsRequestContextGetter(); } - URLRequestContextGetter* GetRequestContextForIsolatedApp( + net::URLRequestContextGetter* GetRequestContextForIsolatedApp( const std::string& app_id) { return io_data_.GetIsolatedAppRequestContextGetter(app_id); } |