chrome/browser/ui/webui/options/content_settings_handler.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: chrome/browser/ui/webui/options/content_settings_handler.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 | « chrome/browser/plugins/plugin_observer.cc ('k') | components/content_settings/core/browser/content_settings_policy_provider.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/webui/options/content_settings_handler.cc

diff --git a/chrome/browser/ui/webui/options/content_settings_handler.cc b/chrome/browser/ui/webui/options/content_settings_handler.cc

index 3350692ed36dd3a571e76a21349e9fc68d21d6b6..41bb7f5ea4baaade2f99eb05d3a9b853e1045ccd 100644

--- a/chrome/browser/ui/webui/options/content_settings_handler.cc

+++ b/chrome/browser/ui/webui/options/content_settings_handler.cc

@@ -766,10 +766,6 @@ void ContentSettingsHandler::UpdateExceptionsViewFromModel(

// supposed to be set by flags and field trials only, thus there is no

// user facing UI for this content type and we skip it here.

break;

-#if defined(OS_WIN)

- case CONTENT_SETTINGS_TYPE_METRO_SWITCH_TO_DESKTOP:

- break;

-#endif

case CONTENT_SETTINGS_TYPE_APP_BANNER:

// The content settings type CONTENT_SETTINGS_TYPE_APP_BANNER is used to

// track whether app banners should be shown or not, and is not a user

@@ -797,9 +793,6 @@ void ContentSettingsHandler::UpdateOTRExceptionsViewFromModel(

case CONTENT_SETTINGS_TYPE_NOTIFICATIONS:

case CONTENT_SETTINGS_TYPE_AUTO_SELECT_CERTIFICATE:

case CONTENT_SETTINGS_TYPE_MIXEDSCRIPT:

-#if defined(OS_WIN)

- case CONTENT_SETTINGS_TYPE_METRO_SWITCH_TO_DESKTOP:

-#endif

case CONTENT_SETTINGS_TYPE_MEDIASTREAM:

case CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC:

case CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA: