Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1179)

Unified Diff: chrome/browser/ui/cocoa/website_settings_bubble_controller.mm

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 | « no previous file | chrome/browser/ui/gtk/website_settings/permission_selector.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/cocoa/website_settings_bubble_controller.mm
diff --git a/chrome/browser/ui/cocoa/website_settings_bubble_controller.mm b/chrome/browser/ui/cocoa/website_settings_bubble_controller.mm
index ee9d575a15fca276cbf899a9d43178925d621977..6fe2ea0be988bda648269007dcddd2dba89662c6 100644
--- a/chrome/browser/ui/cocoa/website_settings_bubble_controller.mm
+++ b/chrome/browser/ui/cocoa/website_settings_bubble_controller.mm
@@ -872,9 +872,9 @@ NSColor* IdentityVerifiedTextColor() {
// Create the popup menu.
// TODO(dubroy): Refactor this code to use PermissionMenuModel.
- // Media stream permission does not support "Always allow".
- // TODO(xians): Media supports "allow" for https but not for http.
- if (permissionInfo.type != CONTENT_SETTINGS_TYPE_MEDIASTREAM) {
+ // Media stream permission only support "Always allow" for https.
+ if (permissionInfo.type != CONTENT_SETTINGS_TYPE_MEDIASTREAM ||
+ (webContents_ && webContents_->GetURL().SchemeIsSecure())) {
[button addItemWithTitle:
l10n_util::GetNSString(IDS_WEBSITE_SETTINGS_MENU_ITEM_ALLOW)];
[[button lastItem] setTag:CONTENT_SETTING_ALLOW];
« no previous file with comments | « no previous file | chrome/browser/ui/gtk/website_settings/permission_selector.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698