chrome/browser/ui/views/website_settings/permission_selector_view.cc - Issue 11571010: fixed the DCHECK and also corrected the website setting UI for media

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 11571010: fixed the DCHECK and also corrected the website setting UI for media (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: addressed Markus' comment and consolidated |web_content_|. Created 8 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/views/website_settings/permission_selector_view.h ('k') | chrome/browser/ui/views/website_settings/website_settings_popup_view.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 fdb444565a25379f42c0a3c6234da28c3a15ad1b..0416b1e72e4b2bdda58caa690c1271bf8b5bea2a 100644

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

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

@@ -150,6 +150,7 @@ void PermissionMenuButton::OnMenuButtonClicked(View* source,

///////////////////////////////////////////////////////////////////////////////

PermissionSelectorView::PermissionSelectorView(

+ const GURL& url,

ContentSettingsType type,

ContentSetting default_setting,

ContentSetting current_setting,

@@ -208,7 +209,7 @@ PermissionSelectorView::PermissionSelectorView(

views::GridLayout::CENTER);

// Create the permission menu button.

menu_button_model_.reset(new PermissionMenuModel(

- this, type, default_setting, current_setting));

+ this, url, type, default_setting, current_setting));

bool button_enabled = source == content_settings::SETTING_SOURCE_USER;

menu_button_ = new internal::PermissionMenuButton(

WebsiteSettingsUI::PermissionActionToUIString(current_setting,