Revert of Use a single views::MenuConfig instance for each platform

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 319 matching lines @@
       if (i->second.disabled)
         menu_button->SetEnabled(false);
 
       layout->AddView(label);
       layout->AddView(menu_button);
 
       bubble_content_empty = false;
     }
   }
 
-  UpdateMenuButtonSizes();
+  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 @@
     gfx::Point screen_location;
     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));
 }
 
-void ContentSettingBubbleContents::UpdateMenuButtonSizes() {
-  const views::MenuConfig& config = views::MenuConfig::instance();
+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;
 
   // 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();
@@ skipping 10 matching lines @@
   // 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 + margins);
 
   for (MediaMenuPartsMap::const_iterator i = media_menus_.begin();
        i != media_menus_.end(); ++i) {
     i->first->SetMinSize(gfx::Size(menu_width, 0));
     i->first->SetMaxSize(gfx::Size(menu_width, 0));
   }
 }