summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwillchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-23 04:46:32 +0000
committerwillchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-23 04:46:32 +0000
commitefc0c9f2747a4a2371232c4221a26fa40707062a (patch)
tree2690fe2f1b9e344d62910ac742c1d55ffa51f934
parente2d74791bd918b1c071534d29d84f02ac7381c98 (diff)
downloadchromium_src-efc0c9f2747a4a2371232c4221a26fa40707062a.zip
chromium_src-efc0c9f2747a4a2371232c4221a26fa40707062a.tar.gz
chromium_src-efc0c9f2747a4a2371232c4221a26fa40707062a.tar.bz2
Remove ChromeURLRequestContext::is_media_
BUG=none TEST=compiles Review URL: http://codereview.chromium.org/6342016 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@72291 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/net/chrome_url_request_context.cc8
-rw-r--r--chrome/browser/net/chrome_url_request_context.h7
2 files changed, 2 insertions, 13 deletions
diff --git a/chrome/browser/net/chrome_url_request_context.cc b/chrome/browser/net/chrome_url_request_context.cc
index 2b4473f..e742430 100644
--- a/chrome/browser/net/chrome_url_request_context.cc
+++ b/chrome/browser/net/chrome_url_request_context.cc
@@ -450,7 +450,6 @@ class FactoryForMedia : public ChromeURLRequestContextFactory {
profile->GetRequestContext())),
disk_cache_path_(disk_cache_path),
cache_size_(cache_size) {
- is_media_ = true;
is_off_the_record_ = off_the_record;
}
@@ -767,8 +766,7 @@ void ChromeURLRequestContextGetter::GetCookieStoreAsyncHelper(
// ----------------------------------------------------------------------------
ChromeURLRequestContext::ChromeURLRequestContext()
- : is_media_(false),
- is_off_the_record_(false) {
+ : is_off_the_record_(false) {
CheckCurrentlyOnIOThread();
}
@@ -843,8 +841,7 @@ void ChromeURLRequestContext::OnDefaultCharsetChange(
// ChromeURLRequestContext on the IO thread (see
// ApplyProfileParametersToContext() which reverses this).
ChromeURLRequestContextFactory::ChromeURLRequestContextFactory(Profile* profile)
- : is_media_(false),
- is_off_the_record_(profile->IsOffTheRecord()),
+ : is_off_the_record_(profile->IsOffTheRecord()),
io_thread_(g_browser_process->io_thread()) {
CheckCurrentlyOnMainThread();
PrefService* prefs = profile->GetPrefs();
@@ -897,7 +894,6 @@ void ChromeURLRequestContextFactory::ApplyProfileParametersToContext(
ChromeURLRequestContext* context) {
// Apply all the parameters. NOTE: keep this in sync with
// ChromeURLRequestContextFactory(Profile*).
- context->set_is_media(is_media_);
context->set_is_off_the_record(is_off_the_record_);
context->set_accept_language(accept_language_);
context->set_accept_charset(accept_charset_);
diff --git a/chrome/browser/net/chrome_url_request_context.h b/chrome/browser/net/chrome_url_request_context.h
index e6c4f02..4bc90e3 100644
--- a/chrome/browser/net/chrome_url_request_context.h
+++ b/chrome/browser/net/chrome_url_request_context.h
@@ -79,9 +79,6 @@ class ChromeURLRequestContext : public net::URLRequestContext {
bool is_off_the_record() const {
return is_off_the_record_;
}
- bool is_media() const {
- return is_media_;
- }
virtual const std::string& GetUserAgent(const GURL& url) const;
@@ -141,9 +138,6 @@ class ChromeURLRequestContext : public net::URLRequestContext {
void set_is_off_the_record(bool is_off_the_record) {
is_off_the_record_ = is_off_the_record;
}
- void set_is_media(bool is_media) {
- is_media_ = is_media;
- }
void set_host_content_settings_map(
HostContentSettingsMap* host_content_settings_map) {
host_content_settings_map_ = host_content_settings_map;
@@ -195,7 +189,6 @@ class ChromeURLRequestContext : public net::URLRequestContext {
scoped_refptr<ExtensionInfoMap> extension_info_map_;
scoped_refptr<PrerenderManager> prerender_manager_;
- bool is_media_;
bool is_off_the_record_;
private: