chrome/browser/ui/views/website_settings/permission_selector_view.h - 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.h

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/cocoa/website_settings_bubble_controller.mm ('K') | « chrome/browser/ui/gtk/website_settings/website_settings_popup_gtk.cc ('k') | chrome/browser/ui/views/website_settings/permission_selector_view.cc » ('j') | chrome/browser/ui/views/website_settings/website_settings_popup_view.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 257ef651449135d9f374435726d6d28060906fce..be69ddbdc97e0e4f59ce9c30f56bfddbbb1e580c 100644

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

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

@@ -31,7 +31,8 @@ class MenuRunner;

class PermissionSelectorView : public views::View,

public PermissionMenuModel::Delegate {

public:

- PermissionSelectorView(ContentSettingsType type,

+ PermissionSelectorView(const GURL& url,

+ ContentSettingsType type,

ContentSetting default_setting,

ContentSetting current_setting,

content_settings::SettingSource source);