diff options
| author | raymes <raymes@chromium.org> | 2015-08-09 18:19:31 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-08-10 01:20:01 +0000 |
| commit | 58a07059347a10730c3d0e70bbc189c1c21bae49 (patch) | |
| tree | b17141ee5c3dce21656f1b3bac6d9ae348184ffe /components/content_settings | |
| parent | a26c56ff54264d1eb1f62c02fcf61392ff1ea662 (diff) | |
| download | chromium_src-58a07059347a10730c3d0e70bbc189c1c21bae49.zip chromium_src-58a07059347a10730c3d0e70bbc189c1c21bae49.tar.gz chromium_src-58a07059347a10730c3d0e70bbc189c1c21bae49.tar.bz2 | |
Remove deprecated CONTENT_SETTINGS_TYPE_METRO_SWITCH_TO_DESKTOP content setting
This content setting was used for a "Don't ask again" button on the Metro mode infobar, but it appears that got removed at the behest of UI review (https://codereview.chromium.org/23591005) a while ago, so we can remove the setting completely.
BUG=512683
Review URL: https://codereview.chromium.org/1274383002
Cr-Commit-Position: refs/heads/master@{#342572}
Diffstat (limited to 'components/content_settings')
4 files changed, 3 insertions, 17 deletions
diff --git a/components/content_settings/core/browser/content_settings_policy_provider.cc b/components/content_settings/core/browser/content_settings_policy_provider.cc index a171f48..7206a1f 100644 --- a/components/content_settings/core/browser/content_settings_policy_provider.cc +++ b/components/content_settings/core/browser/content_settings_policy_provider.cc @@ -41,9 +41,7 @@ const char* kPrefToManageType[] = { nullptr, // No policy for default value of MIDI system exclusive requests nullptr, // No policy for default value of push messaging requests nullptr, // No policy for default value of SSL certificate decisions -#if defined(OS_WIN) - nullptr, // No policy for default value of "switch to desktop" -#elif defined(OS_ANDROID) || defined(OS_CHROMEOS) +#if defined(OS_ANDROID) || defined(OS_CHROMEOS) nullptr, // No policy for default value of protected media identifier #endif nullptr, // No policy for default value of app banners diff --git a/components/content_settings/core/browser/website_settings_registry.cc b/components/content_settings/core/browser/website_settings_registry.cc index fe2e048..b10c66a 100644 --- a/components/content_settings/core/browser/website_settings_registry.cc +++ b/components/content_settings/core/browser/website_settings_registry.cc @@ -85,10 +85,6 @@ WebsiteSettingsRegistry::WebsiteSettingsRegistry() { // Deprecated. RegisterWebsiteSetting(CONTENT_SETTINGS_TYPE_MEDIASTREAM, "media-stream"); -#if defined(OS_WIN) - RegisterContentSetting(CONTENT_SETTINGS_TYPE_METRO_SWITCH_TO_DESKTOP, - "metro-switch-to-desktop", CONTENT_SETTING_ASK); -#endif } WebsiteSettingsRegistry::~WebsiteSettingsRegistry() {} diff --git a/components/content_settings/core/common/content_settings.cc b/components/content_settings/core/common/content_settings.cc index a9f3867..ef9d364 100644 --- a/components/content_settings/core/common/content_settings.cc +++ b/components/content_settings/core/common/content_settings.cc @@ -57,10 +57,7 @@ ContentSettingsTypeHistogram ContentSettingTypeToHistogramValue( return CONTENT_SETTINGS_TYPE_HISTOGRAM_PUSH_MESSAGING; case CONTENT_SETTINGS_TYPE_SSL_CERT_DECISIONS: return CONTENT_SETTINGS_TYPE_HISTOGRAM_SSL_CERT_DECISIONS; -#if defined(OS_WIN) - case CONTENT_SETTINGS_TYPE_METRO_SWITCH_TO_DESKTOP: - return CONTENT_SETTINGS_TYPE_HISTOGRAM_METRO_SWITCH_TO_DESKTOP; -#elif defined(OS_ANDROID) || defined(OS_CHROMEOS) +#if defined(OS_ANDROID) || defined(OS_CHROMEOS) case CONTENT_SETTINGS_TYPE_PROTECTED_MEDIA_IDENTIFIER: return CONTENT_SETTINGS_TYPE_HISTOGRAM_PROTECTED_MEDIA_IDENTIFIER; #endif @@ -91,9 +88,6 @@ bool IsContentSettingsTypeSyncable(ContentSettingsType content_setting) { case CONTENT_SETTINGS_TYPE_AUTOMATIC_DOWNLOADS: case CONTENT_SETTINGS_TYPE_MIDI_SYSEX: case CONTENT_SETTINGS_TYPE_PUSH_MESSAGING: -#if defined(OS_WIN) - case CONTENT_SETTINGS_TYPE_METRO_SWITCH_TO_DESKTOP: -#endif return true; case CONTENT_SETTINGS_TYPE_GEOLOCATION: diff --git a/components/content_settings/core/common/content_settings_types.h b/components/content_settings/core/common/content_settings_types.h index 7fa6106..94965a2 100644 --- a/components/content_settings/core/common/content_settings_types.h +++ b/components/content_settings/core/common/content_settings_types.h @@ -41,9 +41,7 @@ enum ContentSettingsType { CONTENT_SETTINGS_TYPE_MIDI_SYSEX, CONTENT_SETTINGS_TYPE_PUSH_MESSAGING, CONTENT_SETTINGS_TYPE_SSL_CERT_DECISIONS, -#if defined(OS_WIN) - CONTENT_SETTINGS_TYPE_METRO_SWITCH_TO_DESKTOP, -#elif defined(OS_ANDROID) || defined(OS_CHROMEOS) +#if defined(OS_ANDROID) || defined(OS_CHROMEOS) CONTENT_SETTINGS_TYPE_PROTECTED_MEDIA_IDENTIFIER, #endif CONTENT_SETTINGS_TYPE_APP_BANNER, |