chrome/browser/ui/website_settings/website_settings_ui.cc - Issue 829113004: Plugin Power Saver: Add back 'Click to play' option as 4th for plugins.

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/website_settings/website_settings_ui.cc

Issue 829113004: Plugin Power Saver: Add back 'Click to play' option as 4th for plugins. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 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:

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

Download patch

« no previous file with comments | « chrome/browser/resources/options/content_settings_exceptions_area.js ('k') | chrome/browser/ui/webui/options/content_settings_handler.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/website_settings/website_settings_ui.cc

diff --git a/chrome/browser/ui/website_settings/website_settings_ui.cc b/chrome/browser/ui/website_settings/website_settings_ui.cc

index 9ee7e692f86966d2adf11a2e0a70c19c15cbb360..681d5c1e752907791e62bd1e69b4fbeca351aaab 100644

--- a/chrome/browser/ui/website_settings/website_settings_ui.cc

+++ b/chrome/browser/ui/website_settings/website_settings_ui.cc

@@ -162,16 +162,9 @@ base::string16 WebsiteSettingsUI::PermissionActionToUIString(

ContentSetting default_setting,

content_settings::SettingSource source) {

ContentSetting effective_setting = setting;

- if (effective_setting == CONTENT_SETTING_DEFAULT) {

+ if (effective_setting == CONTENT_SETTING_DEFAULT)

effective_setting = default_setting;

- // For Plugins, ASK is obsolete. Show as BLOCK to reflect actual behavior.

- if (type == CONTENT_SETTINGS_TYPE_PLUGINS &&

- default_setting == CONTENT_SETTING_ASK) {

- effective_setting = CONTENT_SETTING_BLOCK;

- }

const int* button_text_ids = NULL;

switch (source) {

case content_settings::SETTING_SOURCE_USER: