views: Make the menu size the same as the menubutton size in the media bubble.

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>
 
 #include "base/bind.h"
 #include "base/stl_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/content_settings/host_content_settings_map.h"
 #include "chrome/browser/plugins/plugin_finder.h"
 #include "chrome/browser/plugins/plugin_metadata.h"
 #include "chrome/browser/ui/content_settings/content_setting_bubble_model.h"
 #include "chrome/browser/ui/content_settings/content_setting_media_menu_model.h"
 #include "chrome/browser/ui/views/browser_dialogs.h"
 #include "content/public/browser/plugin_service.h"
 #include "content/public/browser/web_contents.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/models/simple_menu_model.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/font_list.h"
+#include "ui/gfx/text_utils.h"
 #include "ui/views/controls/button/label_button.h"
 #include "ui/views/controls/button/menu_button.h"
 #include "ui/views/controls/button/radio_button.h"
 #include "ui/views/controls/image_view.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/controls/link.h"
 #include "ui/views/controls/menu/menu.h"
+#include "ui/views/controls/menu/menu_config.h"
 #include "ui/views/controls/menu/menu_runner.h"
 #include "ui/views/controls/separator.h"
 #include "ui/views/layout/grid_layout.h"
 #include "ui/views/layout/layout_constants.h"
 
 #if defined(USE_AURA)
 #include "ui/base/cursor/cursor.h"
 #endif
 
 namespace {
@@ skipping 238 matching lines @@
     views::ColumnSet* menu_column_set =
         layout->AddColumnSet(kMediaMenuColumnSetId);
     menu_column_set->AddPaddingColumn(0, views::kCheckboxIndent);
     menu_column_set->AddColumn(GridLayout::LEADING, GridLayout::FILL, 0,
                                GridLayout::USE_PREF, 0, 0);
     menu_column_set->AddPaddingColumn(
         0, views::kRelatedControlHorizontalSpacing);
     menu_column_set->AddColumn(GridLayout::LEADING, GridLayout::FILL, 1,
                                GridLayout::USE_PREF, 0, 0);
 
-    int menu_width = 0;
     for (ContentSettingBubbleModel::MediaMenuMap::const_iterator i(
          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(base::UTF8ToUTF16(i->second.label));
       label->SetHorizontalAlignment(gfx::ALIGN_LEFT);
@@ skipping 19 matching lines @@
         menu_button->SetText(
             l10n_util::GetStringUTF16(IDS_MEDIA_MENU_NO_DEVICE_TITLE));
         menu_button->SetEnabled(false);
       }
 
       // Disable the device selection when the website is managing the devices
       // itself.
       if (i->second.disabled)
         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 at least kMinMediaMenuButtonWidth. The
-    // maximum width will be clamped by kMaxContentsWidth of the view.
-    menu_width = std::max(kMinMediaMenuButtonWidth, 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_size(gfx::Size(menu_width, 0));
-      i->first->set_max_size(gfx::Size(menu_width, 0));
-    }
-  }
+  UpdateMenuButtonSizes(GetNativeTheme());
 
   const gfx::FontList& domain_font =
       ui::ResourceBundle::GetSharedInstance().GetFontList(
           ui::ResourceBundle::BoldFont);
   for (std::vector<ContentSettingBubbleModel::DomainList>::const_iterator i(
            bubble_content.domain_lists.begin());
        i != bubble_content.domain_lists.end(); ++i) {
     layout->StartRow(0, kSingleColumnSetId);
     views::Label* section_title = new views::Label(base::UTF8ToUTF16(i->title));
     section_title->SetMultiLine(true);
@@ skipping 51 matching lines @@
 
 void ContentSettingBubbleContents::DidNavigateMainFrame(
     const content::LoadCommittedDetails& details,
     const content::FrameNavigateParams& params) {
   // Content settings are based on the main frame, so if it switches then
   // close up shop.
   content_setting_bubble_model_->OnDoneClicked();
   GetWidget()->Close();
 }
 
+void ContentSettingBubbleContents::OnNativeThemeChanged(
+    const ui::NativeTheme* theme) {
+  views::BubbleDelegateView::OnNativeThemeChanged(theme);
+  UpdateMenuButtonSizes(theme);
+}
+
 void ContentSettingBubbleContents::ButtonPressed(views::Button* sender,
                                                  const ui::Event& event) {
   RadioGroup::const_iterator i(
       std::find(radio_group_.begin(), radio_group_.end(), sender));
   if (i != radio_group_.end()) {
     content_setting_bubble_model_->OnRadioClicked(i - radio_group_.begin());
     return;
   }
   DCHECK_EQ(sender, close_button_);
   content_setting_bubble_model_->OnDoneClicked();
@@ skipping 37 matching lines @@
     views::View::ConvertPointToScreen(j->first, &screen_location);
     ignore_result(
         menu_runner_->RunMenuAt(source->GetWidget(),
                                 j->first,
                                 gfx::Rect(screen_location, j->first->size()),
                                 views::MENU_ANCHOR_TOPLEFT,
                                 ui::MENU_SOURCE_NONE,
                                 views::MenuRunner::HAS_MNEMONICS));
 }
 
-int ContentSettingBubbleContents::GetPreferredMediaMenuWidth(
-    views::MenuButton* button,
-    ui::SimpleMenuModel* menu_model) {
-  base::string16 title = button->GetText();
+void ContentSettingBubbleContents::UpdateMenuButtonSizes(
+    const ui::NativeTheme* theme) {
+  const views::MenuConfig config = views::MenuConfig(theme);
+  const int margins = config.item_left_margin + config.check_width +
+                      config.label_to_arrow_padding + config.arrow_width +
+                      config.arrow_to_edge_padding;
 
-  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());
+  // The preferred media menu size sort of copies the logic in
+  // MenuItemView::CalculateDimensions(). When this was using TextButton, it
+  // completely coincidentally matched the logic in MenuItemView. We now need
+  // to redo this manually.
+  int menu_width = 0;
+  for (MediaMenuPartsMap::const_iterator i = media_menus_.begin();
+       i != media_menus_.end(); ++i) {
+    for (int j = 0; j < i->second->menu_model->GetItemCount(); ++j) {
+      int string_width = gfx::GetStringWidth(
+          i->second->menu_model->GetLabelAt(j),
+          config.font_list);
+
+      menu_width = std::max(menu_width, string_width + margins);
+    }
   }
 
-  // Recover the title for the menu button.
-  button->SetText(title);
-  return width;
+  // Make sure the width is at least kMinMediaMenuButtonWidth. The
+  // maximum width will be clamped by kMaxContentsWidth of the view.
+  menu_width = std::max(kMinMediaMenuButtonWidth, menu_width);

[msw, 2014/07/15 02:46:37]

nit: just add |margins| to |menu_width| once here (not in each loop iter).

+
+  for (MediaMenuPartsMap::const_iterator i = media_menus_.begin();
+       i != media_menus_.end(); ++i) {
+      i->first->set_min_size(gfx::Size(menu_width, 0));

[msw, 2014/07/15 02:46:37]

nit: fix indent

+      i->first->set_max_size(gfx::Size(menu_width, 0));
+  }
 }