diff options
18 files changed, 55 insertions, 55 deletions
diff --git a/chrome/browser/content_settings/content_settings_base_provider.cc b/chrome/browser/content_settings/content_settings_base_provider.cc index fdfdc6f..a956035 100644 --- a/chrome/browser/content_settings/content_settings_base_provider.cc +++ b/chrome/browser/content_settings/content_settings_base_provider.cc @@ -39,8 +39,8 @@ ExtendedContentSettings::ExtendedContentSettings( ExtendedContentSettings::~ExtendedContentSettings() {} -BaseProvider::BaseProvider(bool is_otr) - : is_off_the_record_(is_otr) { +BaseProvider::BaseProvider(bool is_incognito) + : is_incognito_(is_incognito) { } BaseProvider::~BaseProvider() {} @@ -79,7 +79,7 @@ ContentSetting BaseProvider::GetContentSetting( // Resolve content settings with resource identifier. // 1. Check for pattern that exactly match the url/host // 1.1 In the content-settings-map - // 1.2 In the off_the_record content-settings-map + // 1.2 In the incognito content-settings-map // 3. Shorten the url subdomain by subdomain and try to find a pattern in // 3.1 OTR content-settings-map // 3.2 content-settings-map @@ -100,8 +100,8 @@ ContentSetting BaseProvider::GetContentSetting( // If this map is not for an incognito profile, these searches will never // match. The additional incognito exceptions always overwrite the // regular ones. - i = off_the_record_settings_.find(host); - if (i != off_the_record_settings_.end() && + i = incognito_settings_.find(host); + if (i != incognito_settings_.end() && i->second.content_settings_for_resources.find(requested_setting) != i->second.content_settings_for_resources.end()) { return i->second.content_settings_for_resources.find( @@ -111,8 +111,8 @@ ContentSetting BaseProvider::GetContentSetting( // Match patterns starting with the most concrete pattern match. for (std::string key = std::string(ContentSettingsPattern::kDomainWildcard) + host; ; ) { - HostContentSettings::const_iterator i(off_the_record_settings_.find(key)); - if (i != off_the_record_settings_.end() && + HostContentSettings::const_iterator i(incognito_settings_.find(key)); + if (i != incognito_settings_.end() && i->second.content_settings_for_resources.find(requested_setting) != i->second.content_settings_for_resources.end()) { return i->second.content_settings_for_resources.find( @@ -146,7 +146,7 @@ void BaseProvider::GetAllContentSettingsRules( content_setting_rules->clear(); const HostContentSettings* map_to_return = - is_off_the_record_ ? &off_the_record_settings_ : &host_content_settings_; + is_incognito_ ? &incognito_settings_ : &host_content_settings_; ContentSettingsTypeResourceIdentifierPair requested_setting( content_type, resource_identifier); @@ -192,8 +192,8 @@ ContentSettings BaseProvider::GetNonDefaultContentSettings( // If this map is not for an incognito profile, these searches will never // match. The additional incognito exceptions always overwrite the // regular ones. - i = off_the_record_settings_.find(host); - if (i != off_the_record_settings_.end()) { + i = incognito_settings_.find(host); + if (i != incognito_settings_.end()) { for (int j = 0; j < CONTENT_SETTINGS_NUM_TYPES; ++j) if (i->second.content_settings.settings[j] != CONTENT_SETTING_DEFAULT) output.settings[j] = i->second.content_settings.settings[j]; @@ -202,8 +202,8 @@ ContentSettings BaseProvider::GetNonDefaultContentSettings( // Match patterns starting with the most concrete pattern match. for (std::string key = std::string(ContentSettingsPattern::kDomainWildcard) + host; ; ) { - HostContentSettings::const_iterator i(off_the_record_settings_.find(key)); - if (i != off_the_record_settings_.end()) { + HostContentSettings::const_iterator i(incognito_settings_.find(key)); + if (i != incognito_settings_.end()) { for (int j = 0; j < CONTENT_SETTINGS_NUM_TYPES; ++j) { if (output.settings[j] == CONTENT_SETTING_DEFAULT) output.settings[j] = i->second.content_settings.settings[j]; diff --git a/chrome/browser/content_settings/content_settings_base_provider.h b/chrome/browser/content_settings/content_settings_base_provider.h index bbfa6e9..6f3ae4d 100644 --- a/chrome/browser/content_settings/content_settings_base_provider.h +++ b/chrome/browser/content_settings/content_settings_base_provider.h @@ -100,16 +100,16 @@ class BaseProvider : public ProviderInterface { return &host_content_settings_; } - HostContentSettings* off_the_record_settings() { - return &off_the_record_settings_; + HostContentSettings* incognito_settings() { + return &incognito_settings_; } base::Lock& lock() const { return lock_; } - bool is_off_the_record() const { - return is_off_the_record_; + bool is_incognito() const { + return is_incognito_; } private: @@ -118,11 +118,11 @@ class BaseProvider : public ProviderInterface { HostContentSettings host_content_settings_; // Whether this settings map is for an OTR session. - bool is_off_the_record_; + bool is_incognito_; // Differences to the preference-stored host content settings for // incognito settings. - HostContentSettings off_the_record_settings_; + HostContentSettings incognito_settings_; // Used around accesses to the content_settings_ object to guarantee // thread safety. diff --git a/chrome/browser/content_settings/content_settings_pref_provider.cc b/chrome/browser/content_settings/content_settings_pref_provider.cc index 6f96a248..5efbc9d 100644 --- a/chrome/browser/content_settings/content_settings_pref_provider.cc +++ b/chrome/browser/content_settings/content_settings_pref_provider.cc @@ -77,7 +77,7 @@ namespace content_settings { PrefDefaultProvider::PrefDefaultProvider(Profile* profile) : profile_(profile), - is_off_the_record_(profile_->IsOffTheRecord()), + is_incognito_(profile_->IsOffTheRecord()), updating_preferences_(false) { initializing_ = true; PrefService* prefs = profile->GetPrefs(); @@ -118,7 +118,7 @@ void PrefDefaultProvider::UpdateDefaultSetting( // The default settings may not be directly modified for OTR sessions. // Instead, they are synced to the main profile's setting. - if (is_off_the_record_) + if (is_incognito_) return; PrefService* prefs = profile_->GetPrefs(); @@ -159,7 +159,7 @@ void PrefDefaultProvider::ResetToDefaults() { default_content_settings_ = ContentSettings(); ForceDefaultsToBeExplicit(); - if (!is_off_the_record_) { + if (!is_incognito_) { PrefService* prefs = profile_->GetPrefs(); updating_preferences_ = true; prefs->ClearPref(prefs::kDefaultContentSettings); @@ -185,7 +185,7 @@ void PrefDefaultProvider::Observe(NotificationType type, return; } - if (!is_off_the_record_) { + if (!is_incognito_) { NotifyObservers(ContentSettingsDetails( ContentSettingsPattern(), CONTENT_SETTINGS_TYPE_DEFAULT, "")); } @@ -377,8 +377,8 @@ void PrefProvider::SetContentSetting( DictionaryValue* all_settings_dictionary = NULL; // Select content-settings-map to write to. - HostContentSettings* map_to_modify = off_the_record_settings(); - if (!is_off_the_record()) { + HostContentSettings* map_to_modify = incognito_settings(); + if (!is_incognito()) { prefs = profile_->GetPrefs(); all_settings_dictionary = prefs->GetMutableDictionary(prefs::kContentSettingsPatterns); @@ -459,7 +459,7 @@ void PrefProvider::SetContentSetting( } updating_preferences_ = true; - if (!is_off_the_record()) + if (!is_incognito()) ScopedUserPrefUpdate update(prefs, prefs::kContentSettingsPatterns); updating_preferences_ = false; @@ -472,10 +472,10 @@ void PrefProvider::ResetToDefaults() { { base::AutoLock auto_lock(lock()); host_content_settings()->clear(); - off_the_record_settings()->clear(); + incognito_settings()->clear(); } - if (!is_off_the_record()) { + if (!is_incognito()) { PrefService* prefs = profile_->GetPrefs(); updating_preferences_ = true; prefs->ClearPref(prefs::kContentSettingsPatterns); @@ -489,9 +489,9 @@ void PrefProvider::ClearAllContentSettingsRules( PrefService* prefs = NULL; DictionaryValue* all_settings_dictionary = NULL; - HostContentSettings* map_to_modify = off_the_record_settings(); + HostContentSettings* map_to_modify = incognito_settings(); - if (!is_off_the_record()) { + if (!is_incognito()) { prefs = profile_->GetPrefs(); all_settings_dictionary = prefs->GetMutableDictionary(prefs::kContentSettingsPatterns); @@ -531,7 +531,7 @@ void PrefProvider::ClearAllContentSettingsRules( } updating_preferences_ = true; - if (!is_off_the_record()) + if (!is_incognito()) ScopedUserPrefUpdate update(prefs, prefs::kContentSettingsPatterns); updating_preferences_ = false; @@ -558,7 +558,7 @@ void PrefProvider::Observe( return; } - if (!is_off_the_record()) { + if (!is_incognito()) { NotifyObservers(ContentSettingsDetails(ContentSettingsPattern(), CONTENT_SETTINGS_TYPE_DEFAULT, "")); @@ -593,7 +593,7 @@ void PrefProvider::ReadExceptions(bool overwrite) { DictionaryValue* mutable_settings; scoped_ptr<DictionaryValue> mutable_settings_scope; - if (!is_off_the_record()) { + if (!is_incognito()) { mutable_settings = prefs->GetMutableDictionary(prefs::kContentSettingsPatterns); } else { diff --git a/chrome/browser/content_settings/content_settings_pref_provider.h b/chrome/browser/content_settings/content_settings_pref_provider.h index 185e870..068a13e 100644 --- a/chrome/browser/content_settings/content_settings_pref_provider.h +++ b/chrome/browser/content_settings/content_settings_pref_provider.h @@ -76,8 +76,8 @@ class PrefDefaultProvider : public DefaultProviderInterface, Profile* profile_; - // Whether this settings map is for an OTR session. - bool is_off_the_record_; + // Whether this settings map is for an Incognito session. + bool is_incognito_; // Used around accesses to the default_content_settings_ object to guarantee // thread safety. diff --git a/chrome/browser/extensions/extensions_ui.cc b/chrome/browser/extensions/extensions_ui.cc index 6879b06..420b83f 100644 --- a/chrome/browser/extensions/extensions_ui.cc +++ b/chrome/browser/extensions/extensions_ui.cc @@ -90,7 +90,7 @@ ExtensionsUIHTMLSource::ExtensionsUIHTMLSource() } void ExtensionsUIHTMLSource::StartDataRequest(const std::string& path, - bool is_off_the_record, int request_id) { + bool is_incognito, int request_id) { DictionaryValue localized_strings; localized_strings.SetString("title", l10n_util::GetStringUTF16(IDS_EXTENSIONS_TITLE)); diff --git a/chrome/browser/extensions/extensions_ui.h b/chrome/browser/extensions/extensions_ui.h index b2ae8b2..5f4a9d2 100644 --- a/chrome/browser/extensions/extensions_ui.h +++ b/chrome/browser/extensions/extensions_ui.h @@ -49,7 +49,7 @@ class ExtensionsUIHTMLSource : public ChromeURLDataManager::DataSource { // Called when the network layer has requested a resource underneath // the path we registered. virtual void StartDataRequest(const std::string& path, - bool is_off_the_record, + bool is_incognito, int request_id); virtual std::string GetMimeType(const std::string&) const; diff --git a/chrome/browser/safe_browsing/client_side_detection_host_unittest.cc b/chrome/browser/safe_browsing/client_side_detection_host_unittest.cc index 3ef8039..0943535 100644 --- a/chrome/browser/safe_browsing/client_side_detection_host_unittest.cc +++ b/chrome/browser/safe_browsing/client_side_detection_host_unittest.cc @@ -159,7 +159,7 @@ class ClientSideDetectionHostTest : public RenderViewHostTestHarness { void ExpectPreClassificationChecks(const GURL& url, const bool* is_private, - const bool* is_off_the_record, + const bool* is_incognito, const bool* match_csd_whitelist, const bool* get_valid_cached_result, const bool* is_in_cache, @@ -168,9 +168,9 @@ class ClientSideDetectionHostTest : public RenderViewHostTestHarness { EXPECT_CALL(*csd_service_, IsPrivateIPAddress(_)) .WillOnce(Return(*is_private)); } - if (is_off_the_record) { + if (is_incognito) { EXPECT_CALL(*mock_profile_, IsOffTheRecord()) - .WillRepeatedly(Return(*is_off_the_record)); + .WillRepeatedly(Return(*is_incognito)); } if (match_csd_whitelist) { EXPECT_CALL(*sb_service_, MatchCsdWhitelistUrl(url)) diff --git a/chrome/browser/ui/webui/chromeos/proxy_settings_ui.cc b/chrome/browser/ui/webui/chromeos/proxy_settings_ui.cc index 7cc5504..2a53700 100644 --- a/chrome/browser/ui/webui/chromeos/proxy_settings_ui.cc +++ b/chrome/browser/ui/webui/chromeos/proxy_settings_ui.cc @@ -26,7 +26,7 @@ class ProxySettingsHTMLSource : public ChromeURLDataManager::DataSource { // Called when the network layer has requested a resource underneath // the path we registered. virtual void StartDataRequest(const std::string& path, - bool is_off_the_record, + bool is_incognito, int request_id); virtual std::string GetMimeType(const std::string&) const { return "text/html"; @@ -45,7 +45,7 @@ ProxySettingsHTMLSource::ProxySettingsHTMLSource( } void ProxySettingsHTMLSource::StartDataRequest(const std::string& path, - bool is_off_the_record, + bool is_incognito, int request_id) { SetFontAndTextDirection(localized_strings_.get()); diff --git a/chrome/browser/ui/webui/devtools_ui.cc b/chrome/browser/ui/webui/devtools_ui.cc index 76293a8..4e9f6c4 100644 --- a/chrome/browser/ui/webui/devtools_ui.cc +++ b/chrome/browser/ui/webui/devtools_ui.cc @@ -28,7 +28,7 @@ class DevToolsDataSource : public ChromeURLDataManager::DataSource { DevToolsDataSource(); virtual void StartDataRequest(const std::string& path, - bool is_off_the_record, + bool is_incognito, int request_id); virtual std::string GetMimeType(const std::string& path) const; @@ -43,7 +43,7 @@ DevToolsDataSource::DevToolsDataSource() } void DevToolsDataSource::StartDataRequest(const std::string& path, - bool is_off_the_record, + bool is_incognito, int request_id) { std::string filename = PathWithoutParams(path); diff --git a/chrome/browser/ui/webui/slideshow_ui.cc b/chrome/browser/ui/webui/slideshow_ui.cc index cbb39e7..059dd6e 100644 --- a/chrome/browser/ui/webui/slideshow_ui.cc +++ b/chrome/browser/ui/webui/slideshow_ui.cc @@ -44,7 +44,7 @@ class SlideshowUIHTMLSource : public ChromeURLDataManager::DataSource { // Called when the network layer has requested a resource underneath // the path we registered. virtual void StartDataRequest(const std::string& path, - bool is_off_the_record, + bool is_incognito, int request_id); virtual std::string GetMimeType(const std::string&) const { return "text/html"; @@ -109,7 +109,7 @@ SlideshowUIHTMLSource::SlideshowUIHTMLSource() } void SlideshowUIHTMLSource::StartDataRequest(const std::string& path, - bool is_off_the_record, + bool is_incognito, int request_id) { DictionaryValue localized_strings; // TODO(dhg): Add stirings to localized strings, also add more strings diff --git a/chrome/browser/ui/webui/sync_internals_html_source.cc b/chrome/browser/ui/webui/sync_internals_html_source.cc index 6976811..c5c2809 100644 --- a/chrome/browser/ui/webui/sync_internals_html_source.cc +++ b/chrome/browser/ui/webui/sync_internals_html_source.cc @@ -23,7 +23,7 @@ SyncInternalsHTMLSource::SyncInternalsHTMLSource() SyncInternalsHTMLSource::~SyncInternalsHTMLSource() {} void SyncInternalsHTMLSource::StartDataRequest(const std::string& path, - bool is_off_the_record, + bool is_incognito, int request_id) { base::StringPiece html_template( ResourceBundle::GetSharedInstance().GetRawDataResource( diff --git a/chrome/browser/ui/webui/sync_internals_html_source.h b/chrome/browser/ui/webui/sync_internals_html_source.h index 2afe5d0..6ef23ff 100644 --- a/chrome/browser/ui/webui/sync_internals_html_source.h +++ b/chrome/browser/ui/webui/sync_internals_html_source.h @@ -17,7 +17,7 @@ class SyncInternalsHTMLSource : public ChromeURLDataManager::DataSource { // ChromeURLDataManager::DataSource implementation. virtual void StartDataRequest(const std::string& path, - bool is_off_the_record, + bool is_incognito, int request_id); virtual std::string GetMimeType(const std::string& path) const; diff --git a/chrome/browser/ui/webui/textfields_ui.cc b/chrome/browser/ui/webui/textfields_ui.cc index 88a9e0d..a87f90d 100644 --- a/chrome/browser/ui/webui/textfields_ui.cc +++ b/chrome/browser/ui/webui/textfields_ui.cc @@ -26,7 +26,7 @@ TextfieldsUIHTMLSource::TextfieldsUIHTMLSource() } void TextfieldsUIHTMLSource::StartDataRequest(const std::string& path, - bool is_off_the_record, + bool is_incognito, int request_id) { const std::string full_html = ResourceBundle::GetSharedInstance() .GetRawDataResource(IDR_TEXTFIELDS_HTML).as_string(); diff --git a/chrome/browser/ui/webui/textfields_ui.h b/chrome/browser/ui/webui/textfields_ui.h index 4ce9ef8..a9d0f31 100644 --- a/chrome/browser/ui/webui/textfields_ui.h +++ b/chrome/browser/ui/webui/textfields_ui.h @@ -26,7 +26,7 @@ class TextfieldsUIHTMLSource : public ChromeURLDataManager::DataSource { // Called when the network layer has requested a resource underneath // the path we registered. virtual void StartDataRequest(const std::string& path, - bool is_off_the_record, + bool is_incognito, int request_id); virtual std::string GetMimeType(const std::string& path) const; diff --git a/chrome/browser/ui/webui/theme_source.cc b/chrome/browser/ui/webui/theme_source.cc index 35f6729..010b3a1 100644 --- a/chrome/browser/ui/webui/theme_source.cc +++ b/chrome/browser/ui/webui/theme_source.cc @@ -41,7 +41,7 @@ ThemeSource::~ThemeSource() { } void ThemeSource::StartDataRequest(const std::string& path, - bool is_off_the_record, + bool is_incognito, int request_id) { // Our path may include cachebuster arguments, so trim them off. std::string uncached_path = StripQueryParams(path); @@ -49,8 +49,8 @@ void ThemeSource::StartDataRequest(const std::string& path, if (uncached_path == kNewTabCSSPath || uncached_path == kNewIncognitoTabCSSPath) { DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); - DCHECK((uncached_path == kNewTabCSSPath && !is_off_the_record) || - (uncached_path == kNewIncognitoTabCSSPath && is_off_the_record)); + DCHECK((uncached_path == kNewTabCSSPath && !is_incognito) || + (uncached_path == kNewIncognitoTabCSSPath && is_incognito)); SendResponse(request_id, css_bytes_); return; diff --git a/chrome/browser/ui/webui/theme_source.h b/chrome/browser/ui/webui/theme_source.h index 037bb83..c3d8207 100644 --- a/chrome/browser/ui/webui/theme_source.h +++ b/chrome/browser/ui/webui/theme_source.h @@ -20,7 +20,7 @@ class ThemeSource : public ChromeURLDataManager::DataSource { // Called when the network layer has requested a resource underneath // the path we registered. virtual void StartDataRequest(const std::string& path, - bool is_off_the_record, + bool is_incognito, int request_id); virtual std::string GetMimeType(const std::string& path) const; diff --git a/chrome/browser/ui/webui/thumbnail_source.cc b/chrome/browser/ui/webui/thumbnail_source.cc index 3123e21..8b98a9f 100644 --- a/chrome/browser/ui/webui/thumbnail_source.cc +++ b/chrome/browser/ui/webui/thumbnail_source.cc @@ -22,7 +22,7 @@ ThumbnailSource::~ThumbnailSource() { } void ThumbnailSource::StartDataRequest(const std::string& path, - bool is_off_the_record, + bool is_incognito, int request_id) { scoped_refptr<RefCountedBytes> data; if (top_sites_->GetPageThumbnail(GURL(path), &data)) { diff --git a/chrome/browser/ui/webui/thumbnail_source.h b/chrome/browser/ui/webui/thumbnail_source.h index a759225..d9d1119 100644 --- a/chrome/browser/ui/webui/thumbnail_source.h +++ b/chrome/browser/ui/webui/thumbnail_source.h @@ -28,7 +28,7 @@ class ThumbnailSource : public ChromeURLDataManager::DataSource { // Called when the network layer has requested a resource underneath // the path we registered. virtual void StartDataRequest(const std::string& path, - bool is_off_the_record, + bool is_incognito, int request_id); virtual std::string GetMimeType(const std::string& path) const; |