chrome/browser/ui/views/website_settings/permission_selector_view.cc - Issue 819183002: Plugin Power Saver: Fix DETECT in WebsiteSettingsUI omnibox dropdown.

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

Issue 819183002: Plugin Power Saver: Fix DETECT in WebsiteSettingsUI omnibox dropdown. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@0210-plugin-power-saver-fix-website-settings-plugin-ask-backportable

Patch Set: fix mac stuff Created 6 years 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/ui/cocoa/website_settings/website_settings_bubble_controller.mm ('k') | chrome/browser/ui/website_settings/permission_menu_model.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/views/website_settings/permission_selector_view.cc

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

index bfe309fc23f643c1113edaf84eff04efdbf8974f..3e110f787e13a4dffda2855578bf755560ec09c3 100644

--- a/chrome/browser/ui/views/website_settings/permission_selector_view.cc

+++ b/chrome/browser/ui/views/website_settings/permission_selector_view.cc

@@ -176,9 +176,9 @@ PermissionSelectorView::PermissionSelectorView(

permission.source == content_settings::SETTING_SOURCE_USER;

menu_button_ = new internal::PermissionMenuButton(

WebsiteSettingsUI::PermissionActionToUIString(

- permission.setting, permission.default_setting, permission.source),

- menu_model_.get(),

- button_enabled);

+ permission.type, permission.setting, permission.default_setting,

+ permission.source),

+ menu_model_.get(), button_enabled);

menu_button_->SetEnabled(button_enabled);

menu_button_->SetFocusable(button_enabled);

menu_button_->SetAccessibleName(

@@ -211,8 +211,7 @@ void PermissionSelectorView::PermissionChanged(

// Update the menu button text to reflect the new setting.

menu_button_->SetText(WebsiteSettingsUI::PermissionActionToUIString(

- permission.setting,

- permission.default_setting,

+ permission.type, permission.setting, permission.default_setting,

content_settings::SETTING_SOURCE_USER));

FOR_EACH_OBSERVER(PermissionSelectorViewObserver,