components/content_settings/core/common/content_settings.cc - Issue 1274383002: Remove deprecated CONTENT_SETTINGS_TYPE_METRO_SWITCH_TO_DESKTOP content setting

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: components/content_settings/core/common/content_settings.cc

Issue 1274383002: Remove deprecated CONTENT_SETTINGS_TYPE_METRO_SWITCH_TO_DESKTOP content setting (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 years, 4 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « components/content_settings/core/browser/website_settings_registry.cc ('k') | components/content_settings/core/common/content_settings_types.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: components/content_settings/core/common/content_settings.cc

diff --git a/components/content_settings/core/common/content_settings.cc b/components/content_settings/core/common/content_settings.cc

index a9f38671b73ff626705557c49f9d0424d10bf6b6..ef9d364b8cfbb547c4480349eee807ac244d6c8f 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: