diff options
Diffstat (limited to 'chrome/browser/content_settings')
6 files changed, 13 insertions, 13 deletions
diff --git a/chrome/browser/content_settings/content_settings_base_provider.cc b/chrome/browser/content_settings/content_settings_base_provider.cc index b0e7ced..fdfdc6f 100644 --- a/chrome/browser/content_settings/content_settings_base_provider.cc +++ b/chrome/browser/content_settings/content_settings_base_provider.cc @@ -97,8 +97,8 @@ ContentSetting BaseProvider::GetContentSetting( requested_setting)->second; } - // If this map is not for an off-the-record profile, these searches will never - // match. The additional off-the-record exceptions always overwrite the + // 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() && @@ -189,8 +189,8 @@ ContentSettings BaseProvider::GetNonDefaultContentSettings( if (i != host_content_settings_.end()) output = i->second.content_settings; - // If this map is not for an off-the-record profile, these searches will never - // match. The additional off-the-record exceptions always overwrite the + // 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()) { diff --git a/chrome/browser/content_settings/content_settings_base_provider.h b/chrome/browser/content_settings/content_settings_base_provider.h index 1e6c9e4..bbfa6e9 100644 --- a/chrome/browser/content_settings/content_settings_base_provider.h +++ b/chrome/browser/content_settings/content_settings_base_provider.h @@ -121,7 +121,7 @@ class BaseProvider : public ProviderInterface { bool is_off_the_record_; // Differences to the preference-stored host content settings for - // off-the-record settings. + // incognito settings. HostContentSettings off_the_record_settings_; // Used around accesses to the content_settings_ object to guarantee diff --git a/chrome/browser/content_settings/content_settings_pref_provider_unittest.cc b/chrome/browser/content_settings/content_settings_pref_provider_unittest.cc index fda116de..6d223da 100644 --- a/chrome/browser/content_settings/content_settings_pref_provider_unittest.cc +++ b/chrome/browser/content_settings/content_settings_pref_provider_unittest.cc @@ -107,7 +107,7 @@ TEST_F(PrefDefaultProviderTest, OffTheRecord) { otr_provider.ProvideDefaultSetting(CONTENT_SETTINGS_TYPE_COOKIES)); // Changing content settings on the main provider should also affect the - // off-the-record map. + // incognito map. provider.UpdateDefaultSetting(CONTENT_SETTINGS_TYPE_COOKIES, CONTENT_SETTING_BLOCK); EXPECT_EQ(CONTENT_SETTING_BLOCK, @@ -115,7 +115,7 @@ TEST_F(PrefDefaultProviderTest, OffTheRecord) { EXPECT_EQ(CONTENT_SETTING_BLOCK, otr_provider.ProvideDefaultSetting(CONTENT_SETTINGS_TYPE_COOKIES)); - // Changing content settings on the off-the-record provider should be ignored. + // Changing content settings on the incognito provider should be ignored. otr_provider.UpdateDefaultSetting(CONTENT_SETTINGS_TYPE_COOKIES, CONTENT_SETTING_ALLOW); EXPECT_EQ(CONTENT_SETTING_BLOCK, diff --git a/chrome/browser/content_settings/content_settings_provider.h b/chrome/browser/content_settings/content_settings_provider.h index eff1443..88c0a6f 100644 --- a/chrome/browser/content_settings/content_settings_provider.h +++ b/chrome/browser/content_settings/content_settings_provider.h @@ -98,7 +98,7 @@ class ProviderInterface { // For a given content type, returns all content setting rules with a // non-default setting, mapped to their actual settings. // |content_settings_rules| must be non-NULL. If this provider was created for - // the off-the-record profile, it will only return those settings differing + // the incognito profile, it will only return those settings differing // from the corresponding regular provider. For ContentSettingsTypes that // require a resource identifier to be specified, the |resource_identifier| // must be non-empty. diff --git a/chrome/browser/content_settings/host_content_settings_map.h b/chrome/browser/content_settings/host_content_settings_map.h index bdfc318..c6feb8d 100644 --- a/chrome/browser/content_settings/host_content_settings_map.h +++ b/chrome/browser/content_settings/host_content_settings_map.h @@ -94,7 +94,7 @@ class HostContentSettingsMap // For a given content type, returns all patterns with a non-default setting, // mapped to their actual settings, in lexicographical order. |settings| // must be a non-NULL outparam. If this map was created for the - // off-the-record profile, it will only return those settings differing from + // incognito profile, it will only return those settings differing from // the main map. For ContentSettingsTypes that require an resource identifier // to be specified, the |resource_identifier| must be non-empty. // @@ -104,7 +104,7 @@ class HostContentSettingsMap SettingsForOneType* settings) const; // Sets the default setting for a particular content type. This method must - // not be invoked on an off-the-record map. + // not be invoked on an incognito map. // // This should only be called on the UI thread. void SetDefaultContentSetting(ContentSettingsType content_type, @@ -145,7 +145,7 @@ class HostContentSettingsMap } // Sets whether we block all third-party cookies. This method must not be - // invoked on an off-the-record map. + // invoked on an incognito map. // // This should only be called on the UI thread. void SetBlockThirdPartyCookies(bool block); diff --git a/chrome/browser/content_settings/host_content_settings_map_unittest.cc b/chrome/browser/content_settings/host_content_settings_map_unittest.cc index 7748406..16daf33 100644 --- a/chrome/browser/content_settings/host_content_settings_map_unittest.cc +++ b/chrome/browser/content_settings/host_content_settings_map_unittest.cc @@ -464,7 +464,7 @@ TEST_F(HostContentSettingsMapTest, OffTheRecord) { host, CONTENT_SETTINGS_TYPE_IMAGES, "")); // Changing content settings on the main map should also affect the - // off-the-record map. + // incognito map. host_content_settings_map->SetContentSetting(pattern, CONTENT_SETTINGS_TYPE_IMAGES, "", CONTENT_SETTING_BLOCK); EXPECT_EQ(CONTENT_SETTING_BLOCK, @@ -474,7 +474,7 @@ TEST_F(HostContentSettingsMapTest, OffTheRecord) { otr_map->GetContentSetting( host, CONTENT_SETTINGS_TYPE_IMAGES, "")); - // Changing content settings on the off-the-record map should NOT affect the + // Changing content settings on the incognito map should NOT affect the // main map. otr_map->SetContentSetting(pattern, CONTENT_SETTINGS_TYPE_IMAGES, "", CONTENT_SETTING_ALLOW); |