chrome/browser/ui/views/website_settings/website_settings_popup_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/website_settings_popup_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: removed the DCHECK part code, and added allow support to media for https 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

« chrome/browser/ui/views/website_settings/website_settings_popup_view.h ('K') | « chrome/browser/ui/views/website_settings/website_settings_popup_view.h ('k') | chrome/browser/ui/website_settings/permission_menu_model.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 5f67d5026dc4dc4d023c79498892a4e7d96ae311..e394bc08dd91a9987c2eb1decd01ad7f84da9c64 100644

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

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

@@ -491,6 +491,7 @@ void WebsiteSettingsPopupView::SetPermissionInfo(

++permission) {

layout->StartRow(1, content_column);

PermissionSelectorView* selector = new PermissionSelectorView(

+ web_contents_->GetURL(),

permission->type,

permission->default_setting,

permission->setting,