chrome/browser/ui/gtk/website_settings/website_settings_popup_gtk.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/gtk/website_settings/website_settings_popup_gtk.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/gtk/website_settings/permission_selector.cc ('k') | chrome/browser/ui/views/website_settings/permission_selector_view.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index b9475420cd699d9a2029f5d10bdcb7c85c0b33db..5be6b8bc729220c6533a85e7277cc396e9443bb9 100644

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

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

@@ -600,6 +600,7 @@ void WebsiteSettingsPopupGtk::SetPermissionInfo(

PermissionSelector* selector =

new PermissionSelector(

theme_service_,

+ web_contents_ ? web_contents_->GetURL() : GURL::EmptyGURL(),

permission->type,

permission->setting,

permission->default_setting,