chrome/browser/ui/webui/options/content_settings_handler.cc - Issue 9293010: Merge 119773 - Move click-to-play out of chrome://flags.

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 9293010: Merge 119773 - Move click-to-play out of chrome://flags. (Closed) Base URL: svn://svn.chromium.org/chrome/branches/963/src

Patch Set: '' Created 8 years, 11 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 3260f5f18a44189662a60b525b81dd266e0d682f..c27719aa144fce0fd40dd6ccb08bde76c5dbea10 100644

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

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

@@ -278,9 +278,6 @@ void ContentSettingsHandler::GetLocalizedValues(

RegisterStrings(localized_strings, resources, arraysize(resources));

RegisterTitle(localized_strings, "contentSettingsPage",

IDS_CONTENT_SETTINGS_TITLE);

- localized_strings->SetBoolean("enable_click_to_play",

- CommandLine::ForCurrentProcess()->HasSwitch(

- switches::kEnableClickToPlay));

localized_strings->SetBoolean("enable_web_intents",

CommandLine::ForCurrentProcess()->HasSwitch(

switches::kEnableWebIntents));