views::ImageButton: Added SetMinimumImageSize; removed SetPreferredSize.

ui/app_list/views/contents_switcher_view.cc

 // Copyright 2014 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 "ui/app_list/views/contents_switcher_view.h"
 
 #include "ui/app_list/app_list_constants.h"
 #include "ui/app_list/views/contents_view.h"
 #include "ui/views/background.h"
 #include "ui/views/controls/button/custom_button.h"
 #include "ui/views/controls/button/image_button.h"
 #include "ui/views/layout/box_layout.h"
 #include "ui/views/layout/fill_layout.h"
 
 namespace app_list {
 
 namespace {
 
-const int kButtonImageSize = 32;
 const int kButtonSpacing = 4;
 const int kMinimumHeight = 39;
 
 class ContentsPageIndicatorView : public views::View {
  public:
   ContentsPageIndicatorView() {};
   virtual ~ContentsPageIndicatorView() {};
 
   // Overridden from views::View:
   virtual gfx::Size GetPreferredSize() const OVERRIDE {
@@ skipping 12 matching lines @@
       views::BoxLayout::kHorizontal, 0, 0, kButtonSpacing);
   layout->set_main_axis_alignment(views::BoxLayout::MAIN_AXIS_ALIGNMENT_CENTER);
   layout->set_minimum_cross_axis_size(kMinimumHeight);
   SetLayoutManager(layout);
 }
 
 ContentsSwitcherView::~ContentsSwitcherView() {}
 
 void ContentsSwitcherView::AddSwitcherButton(int resource_id, int page_index) {
   views::ImageButton* button = new views::ImageButton(this);
-  button->SetPreferredSize(gfx::Size(kButtonImageSize, kButtonImageSize));
-  if (resource_id) {
-    button->SetImage(
-        views::CustomButton::STATE_NORMAL,
-        ui::ResourceBundle::GetSharedInstance().GetImageSkiaNamed(resource_id));
-  }
+  button->SetImage(
+      views::CustomButton::STATE_NORMAL,
+      ui::ResourceBundle::GetSharedInstance().GetImageSkiaNamed(resource_id));
   button->set_tag(page_index);
 
   // Add an indicator for the current launcher page.
   app_list::ContentsPageIndicatorView* indicator =
       new app_list::ContentsPageIndicatorView();
   indicator->set_background(
       views::Background::CreateSolidBackground(app_list::kPagerSelectedColor));
   indicator->SetVisible(false);
   page_active_indicators_[page_index] = indicator;
 
@@ skipping 47 matching lines @@
   if (pm.IsRevertingCurrentTransition()) {
     // Swap the direction if the transition is reversed.
     old_selected = pm.transition().target_page;
     new_selected = pm.selected_page();
   }
 
   SelectedPageChanged(old_selected, new_selected);
 }
 
 }  // namespace app_list