Remove Layout code from ContentsSwitcherView.

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"
@@ skipping 18 matching lines @@
     return gfx::Size(0, kContentsSwitcherSeparatorHeight);
   };
 
  private:
   DISALLOW_COPY_AND_ASSIGN(ContentsPageIndicatorView);
 };
 
 }  // namespace
 
 ContentsSwitcherView::ContentsSwitcherView(ContentsView* contents_view)
-    : contents_view_(contents_view), buttons_(new views::View) {
-  AddChildView(buttons_);
-
-  buttons_->SetLayoutManager(new views::BoxLayout(
-      views::BoxLayout::kHorizontal, 0, 0, kButtonSpacing));
+    : contents_view_(contents_view) {
+  views::BoxLayout* layout = new views::BoxLayout(
+      views::BoxLayout::kHorizontal, 0, 0, kButtonSpacing);
+  layout->set_main_axis_alignment(views::BoxLayout::MAIN_AXIS_ALIGNMENT_CENTER);
+  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,
@@ skipping 16 matching lines @@
   indicator_container->SetLayoutManager(new views::FillLayout());
   indicator_container->AddChildView(indicator);
 
   // View containing the indicator view and image button.
   views::View* button_container = new views::View();
   button_container->SetLayoutManager(
       new views::BoxLayout(views::BoxLayout::kVertical, 0, 0, 0));
   button_container->AddChildView(indicator_container);
   button_container->AddChildView(button);
 
-  buttons_->AddChildView(button_container);
-}
-
-gfx::Size ContentsSwitcherView::GetPreferredSize() const {
-  return gfx::Size(buttons_->GetPreferredSize().width(),
-                   kButtonImageSize + kContentsSwitcherSeparatorHeight);
-}
-
-void ContentsSwitcherView::Layout() {
-  gfx::Rect rect(GetContentsBounds());
-
-  // Makes |buttons_| horizontally center and vertically fill.
-  gfx::Size buttons_size(buttons_->GetPreferredSize());
-  gfx::Rect buttons_bounds(rect.CenterPoint().x() - buttons_size.width() / 2,
-                           rect.y(),
-                           buttons_size.width(),
-                           rect.height());
-  buttons_->SetBoundsRect(gfx::IntersectRects(rect, buttons_bounds));
+  AddChildView(button_container);
 }
 
 void ContentsSwitcherView::ButtonPressed(views::Button* sender,
                                          const ui::Event& event) {
   contents_view_->SetActivePage(sender->tag());
 }
 
 void ContentsSwitcherView::TotalPagesChanged() {
 }
 
@@ skipping 20 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