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]; |