fixed the DCHECK and also corrected the website setting UI for media

chrome/browser/ui/cocoa/website_settings_bubble_controller.mm

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #import "chrome/browser/ui/cocoa/website_settings_bubble_controller.h"
 
 #include <cmath>
 
 #import <AppKit/AppKit.h>
 
@@ skipping 875 matching lines @@
         l10n_util::GetNSString(IDS_WEBSITE_SETTINGS_MENU_ITEM_BLOCK)];
     [[button lastItem] setTag:CONTENT_SETTING_BLOCK];
   }
 
   [button addItemWithTitle:l10n_util::GetNSStringF(
       IDS_WEBSITE_SETTINGS_DEFAULT_PERMISSION_LABEL,
       WebsiteSettingsUI::PermissionValueToUIString(
           permissionInfo.default_setting))];
   [[button lastItem] setTag:CONTENT_SETTING_DEFAULT];
 
-  [button selectItemWithTag:permissionInfo.setting];
+  if (permissionInfo.type == CONTENT_SETTINGS_TYPE_MEDIASTREAM &&

[markusheintz_, 2012/12/14 10:49:04]

Sorry I think I miss some detail. Why do we need this?

Line 877-881 already makes sure that we exclude the allow option.

If the default settings is used, then the |.setting| should be
CONTENT_SETTING_DEFAULT. The permission info has a separate field for the
effective default setting.
If the |.setting| is not default, then we don't use the default setting.

Creating proper permission info objects should be done in
chrome/browser/ui/website_settings/website_settings.cc.

[markusheintz_, 2012/12/14 15:10:04]

Alrigth after discussing this offline via chat I'm ok with this beeing a
temporary change. Please add a comment and a TODO. If we don't have a bug for
this pls create one and cc me. Thanks a lot! :)

+      permissionInfo.setting == CONTENT_SETTING_ALLOW) {
+    // Show the default setting since MEDIASTREAM does not support allow yet.
+    [button selectItemWithTag:CONTENT_SETTING_DEFAULT];
+  } else {
+    [button selectItemWithTag:permissionInfo.setting];
+  }
 
   // Set the button title.
   scoped_nsobject<NSMenuItem> titleItem([[NSMenuItem alloc] init]);
   string16 buttonTitle = WebsiteSettingsUI::PermissionActionToUIString(
       permissionInfo.setting,
       permissionInfo.default_setting,
       permissionInfo.source);
   [titleItem setTitle:base::SysUTF16ToNSString(buttonTitle)];
   [[button cell] setUsesItemFromMenu:NO];
   [[button cell] setMenuItem:titleItem.get()];
@@ skipping 206 matching lines @@
   }
 
   controlOrigin.y += kPermissionsTabSpacing;
   [cookiesView_ setFrameSize:
       NSMakeSize(NSWidth([cookiesView_ frame]), controlOrigin.y)];
 
   [self performLayout];
 }
 
 - (void)setPermissionInfo:(const PermissionInfoList&)permissionInfoList {
-  // The contents of the permissions view can cause the whole window to get
-  // bigger, but currently permissions are always set before cookie info.
-  // Check to make sure that's still the case.
-  DCHECK_EQ(0U, [[cookiesView_ subviews] count]);

[markusheintz_, 2012/12/14 10:49:04]

Patrick Dubroy will fix the DCHECK issue and upload a separate CL.

-
   [permissionsView_ setSubviews:[NSArray array]];
   NSPoint controlOrigin = NSMakePoint(kFramePadding, 0);
 
   string16 sectionTitle = l10n_util::GetStringUTF16(
       IDS_WEBSITE_SETTINGS_TITLE_SITE_PERMISSIONS);
   NSTextField* header = [self addText:sectionTitle
                              withSize:[NSFont smallSystemFontSize]
                                  bold:YES
                                toView:permissionsView_
                               atPoint:controlOrigin];
@@ skipping 94 matching lines @@
   [bubble_controller_ setPermissionInfo:permission_info_list];
 }
 
 void WebsiteSettingsUIBridge::SetFirstVisit(const string16& first_visit) {
   [bubble_controller_ setFirstVisit:first_visit];
 }
 
 void WebsiteSettingsUIBridge::SetSelectedTab(TabId tab_id) {
   [bubble_controller_ setSelectedTab:tab_id];
 }