Revert of views: Move MenuButton from TextButton to LabelButton.

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 275 matching lines @@
         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);
 
       views::MenuButton* menu_button = new views::MenuButton(
           NULL, base::UTF8ToUTF16((i->second.selected_device.name)),
           this, true);
-      menu_button->SetHorizontalAlignment(gfx::ALIGN_LEFT);
+      menu_button->set_alignment(views::TextButton::ALIGN_LEFT);
+      menu_button->SetBorder(scoped_ptr<views::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;
 
@@ skipping 21 matching lines @@
       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));
+      i->first->set_min_width(menu_width);
+      i->first->set_max_width(menu_width);
     }
   }
 
   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);
@@ skipping 108 matching lines @@
                                 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();
+  base::string16 title = button->text();
 
   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;
 }