Adjust TriView.

ash/common/system/tray/tri_view.cc

 // Copyright 2016 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 "ash/common/system/tray/tri_view.h"
 
 #include "ash/common/system/tray/size_range_layout.h"
 #include "base/logging.h"
 #include "ui/views/border.h"
 #include "ui/views/layout/box_layout.h"
@@ skipping 37 matching lines @@
   AddChildView(new views::View);
   AddChildView(new views::View);
 
   GetContainer(Container::START)
       ->SetLayoutManager(GetLayoutManager(Container::START));
   GetContainer(Container::CENTER)
       ->SetLayoutManager(GetLayoutManager(Container::CENTER));
   GetContainer(Container::END)
       ->SetLayoutManager(GetLayoutManager(Container::END));
 
-  GetLayoutManager(Container::START)
-      ->SetLayoutManager(CreateDefaultLayoutManager(orientation));
-  GetLayoutManager(Container::CENTER)
-      ->SetLayoutManager(CreateDefaultLayoutManager(orientation));
-  GetLayoutManager(Container::END)
-      ->SetLayoutManager(CreateDefaultLayoutManager(orientation));
-
+  box_layout_->set_cross_axis_alignment(
+      views::BoxLayout::CROSS_AXIS_ALIGNMENT_START);
   SetLayoutManager(box_layout_);
 
   enable_hierarchy_changed_dcheck_ = true;
 }
 
 TriView::~TriView() {
   enable_hierarchy_changed_dcheck_ = false;
 }
 
-void TriView::SetMinCrossAxisSize(int min_size) {
-  box_layout_->set_minimum_cross_axis_size(min_size);
-}
-
 void TriView::SetMinSize(Container container, const gfx::Size& size) {
   GetLayoutManager(container)->SetMinSize(size);
 }
 
 void TriView::SetMaxSize(Container container, const gfx::Size& size) {
   GetLayoutManager(container)->SetMaxSize(size);
 }
 
 void TriView::AddView(Container container, views::View* view) {
   GetContainer(container)->AddChildView(view);
@@ skipping 36 matching lines @@
     if (details.is_add) {
       DCHECK(false)
           << "Child views should not be added directly. They should be added "
              "using TriView::AddView().";
     } else {
       DCHECK(false) << "Container views should not be removed.";
     }
   }
 }
 
-std::unique_ptr<views::LayoutManager> TriView::CreateDefaultLayoutManager(
-    Orientation orientation) const {
-  views::BoxLayout* box_layout =
-      new views::BoxLayout(GetOrientation(orientation), 0, 0, 0);
-  box_layout->set_main_axis_alignment(
-      views::BoxLayout::MAIN_AXIS_ALIGNMENT_CENTER);
-  box_layout->set_cross_axis_alignment(
-      views::BoxLayout::CROSS_AXIS_ALIGNMENT_CENTER);
-  return std::unique_ptr<views::LayoutManager>(box_layout);
+views::View* TriView::GetContainer(Container container) {
+  return child_at(static_cast<int>(container));
 }
 
-views::View* TriView::GetContainer(Container container) const {
-  return const_cast<views::View*>(child_at(static_cast<int>(container)));
-}
-
-SizeRangeLayout* TriView::GetLayoutManager(Container container) const {
+SizeRangeLayout* TriView::GetLayoutManager(Container container) {
   switch (container) {
     case Container::START:
       return start_container_layout_manager_;
     case Container::CENTER:
       return center_container_layout_manager_;
     case Container::END:
       return end_container_layout_manager_;
   }
   // Required for some compilers.
   NOTREACHED();
   return nullptr;
 }
 
 }  // namespace ash