Added "None available" title and grey out the media menu when there is no device.

chrome/browser/ui/views/content_setting_bubble_contents.cc

 // 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.
 
 #include "chrome/browser/ui/views/content_setting_bubble_contents.h"
 
 #include <algorithm>
 #include <set>
 #include <string>
 #include <vector>
@@ skipping 35 matching lines @@
 namespace {
 
 // If we don't clamp the maximum width, then very long URLs and titles can make
 // the bubble arbitrarily wide.
 const int kMaxContentsWidth = 500;
 
 // When we have multiline labels, we should set a minimum width lest we get very
 // narrow bubbles with lots of line-wrapping.
 const int kMinMultiLineContentsWidth = 250;
 
-// The minimum and maximum width of the media menu buttons.
+// The minimum width of the media menu buttons.
 const int kMinMediaMenuButtonWidth = 100;
-const int kMaxMediaMenuButtonWidth = 600;
 
 }
 
 using content::PluginService;
 using content::WebContents;
 
 
 // ContentSettingBubbleContents::Favicon --------------------------------------
 
 class ContentSettingBubbleContents::Favicon : public views::ImageView {
@@ skipping 231 matching lines @@
          bubble_content.media_menus.begin());
          i != bubble_content.media_menus.end(); ++i) {
       if (!bubble_content_empty)
         layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing);
       layout->StartRow(0, kMediaMenuColumnSetId);
 
       views::Label* label = new views::Label(UTF8ToUTF16(i->second.label));
       label->SetHorizontalAlignment(gfx::ALIGN_LEFT);
 
       views::MenuButton* menu_button = new views::MenuButton(
-          NULL, UTF8ToUTF16((i->second.selected_device.name)), this, false);
+          NULL, UTF8ToUTF16((i->second.selected_device.name)), this, true);
       menu_button->set_alignment(views::TextButton::ALIGN_LEFT);
       menu_button->set_border(
           new views::TextButtonNativeThemeBorder(menu_button));
       menu_button->set_animate_on_state_change(false);
 
       MediaMenuParts* menu_view = new MediaMenuParts(i->first);
       menu_view->menu_model.reset(new ContentSettingMediaMenuModel(
           i->first,
           content_setting_bubble_model_.get(),
           base::Bind(&ContentSettingBubbleContents::UpdateMenuLabel,
                      base::Unretained(this))));
       media_menus_[menu_button] = menu_view;
 
+      if (!menu_view->menu_model->GetItemCount()) {
+        // Show a "None available" title and grey out the menu when there is no
+        // available device.
+        menu_button->SetText(
+            l10n_util::GetStringUTF16(IDS_MEDIA_MENU_NO_DEVICE_TITLE));
+        menu_button->SetEnabled(false);
+      }
+
       // Use the longest width of the menus as the width of the menu buttons.
       menu_width = std::max(menu_width,
                             GetPreferredMediaMenuWidth(
                                 menu_button, menu_view->menu_model.get()));
 
       layout->AddView(label);
       layout->AddView(menu_button);
 
       bubble_content_empty = false;
     }
 
-    // Make sure the width is within [kMinMediaMenuButtonWidth,
-    // kMaxMediaMenuButtonWidth].
+    // Make sure the width is more than kMinMediaMenuButtonWidth, and the

[Peter Kasting, 2013/03/22 19:43:13]

Nit: "more than" -> "at least", ", and the" -> ".  The"

[no longer working on chromium, 2013/03/23 16:03:08]

Done.

+    // maximum width will be clamped by kMaxContentsWidth of the view.
     menu_width = std::max(kMinMediaMenuButtonWidth, menu_width);
-    menu_width = std::min(kMaxMediaMenuButtonWidth, menu_width);
 
     // Set all the menu buttons to the width we calculated above.
     for (MediaMenuPartsMap::const_iterator i = media_menus_.begin();
          i != media_menus_.end(); ++i) {
       i->first->set_min_width(menu_width);
       i->first->set_max_width(menu_width);
     }
   }
 
   gfx::Font domain_font =
@@ skipping 128 matching lines @@
   int width = button->GetPreferredSize().width();
   for (int i = 0; i < menu_model->GetItemCount(); ++i) {
     button->SetText(menu_model->GetLabelAt(i));
     width = std::max(width, button->GetPreferredSize().width());
   }
 
   // Recover the title for the menu button.
   button->SetText(title);
   return width;
 }