chrome/browser/content_setting_bubble_model.cc - Issue 4643007: Move click-to-play to about: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/content_setting_bubble_model.cc

Issue 4643007: Move click-to-play to about:flags. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: review comments Created 10 years, 1 month 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/content_setting_bubble_model.cc

diff --git a/chrome/browser/content_setting_bubble_model.cc b/chrome/browser/content_setting_bubble_model.cc

index 2cc5d91121094d3b8214c103239bebc89b6bef09..f7e89d4263b1a0cd8a237e5d0bac70284dd46412 100644

--- a/chrome/browser/content_setting_bubble_model.cc

+++ b/chrome/browser/content_setting_bubble_model.cc

@@ -297,16 +297,11 @@ class ContentSettingPluginBubbleModel : public ContentSettingSingleRadioGroup {

private:

void SetLoadPluginsLinkTitle() {

- if (!CommandLine::ForCurrentProcess()->HasSwitch(

- switches::kDisableClickToPlay)) {

- set_load_plugins_link_title(

- l10n_util::GetStringUTF8(IDS_BLOCKED_PLUGINS_LOAD_ALL));

- }

+ set_load_plugins_link_title(

+ l10n_util::GetStringUTF8(IDS_BLOCKED_PLUGINS_LOAD_ALL));

}

virtual void OnLoadPluginsLinkClicked() {

- DCHECK(!CommandLine::ForCurrentProcess()->HasSwitch(

- switches::kDisableClickToPlay));

UserMetrics::RecordAction(UserMetricsAction("ClickToPlay_LoadAll_Bubble"));

if (tab_contents()) {

tab_contents()->render_view_host()->LoadBlockedPlugins();