chrome/browser/ui/website_settings/website_settings.cc - Issue 10831128: (Views only) Disable drop-down buttons in the website settings popup for managed permissions

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.cc

Issue 10831128: (Views only) Disable drop-down buttons in the website settings popup for managed permissions (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Fix mac build. Created 8 years, 4 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/ui/views/website_settings/website_settings_popup_view.cc ('k') | chrome/browser/ui/website_settings/website_settings_ui.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 4a78c08d19c0f5f6d470b3ad3a9bf56e419e53b6..1a7486bd5f6841b61e6593593e21f53129162d2c 100644

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

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

@@ -426,6 +426,7 @@ void WebsiteSettings::PresentSitePermissions() {

DCHECK(value.get());

permission_info.setting =

content_settings::ValueToContentSetting(value.get());

+ permission_info.source = info.source;

if (info.primary_pattern == ContentSettingsPattern::Wildcard() &&

info.secondary_pattern == ContentSettingsPattern::Wildcard()) {