chrome/browser/ui/webui/options/content_settings_handler.cc - Issue 14569010: Enable the settings UI to toggle the device ID on Windows.

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 14569010: Enable the settings UI to toggle the device ID on Windows. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 7 years, 8 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:

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 386b39180c7309be8413aedf4c60e99848d69ce3..635a32c731aa6e51d7136c59c59eb662ebf37cdc 100644

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

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

@@ -340,12 +340,12 @@ void ContentSettingsHandler::GetLocalizedValues(

{ "mouselock_allow", IDS_MOUSE_LOCK_ALLOW_RADIO },

{ "mouselock_ask", IDS_MOUSE_LOCK_ASK_RADIO },

{ "mouselock_block", IDS_MOUSE_LOCK_BLOCK_RADIO },

-#if defined(OS_CHROMEOS)

+#if defined(OS_WIN) || defined(OS_CHROMEOS)

Dan Beam 2013/05/01 20:53:22 nit: #if defined(OS_CHROMEOS) || defined(OS_WIN)

raymes 2013/05/02 17:20:37 Done.

// Protected Content filter

{ "protectedContentTabLabel", IDS_PROTECTED_CONTENT_TAB_LABEL },

{ "protectedContentInfo", IDS_PROTECTED_CONTENT_INFO },

{ "protectedContentEnable", IDS_PROTECTED_CONTENT_ENABLE},

-#endif // defined(OS_CHROMEOS)

+#endif // defined(OS_WIN) || defined(OS_CHROMEOS)

// Media stream capture device filter.

{ "mediaStreamTabLabel", IDS_MEDIA_STREAM_TAB_LABEL },

{ "media-stream_header", IDS_MEDIA_STREAM_HEADER },