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"
 #include "ui/views/layout/fill_layout.h"
 #include "ui/views/layout/layout_manager.h"
 
 namespace ash {
 namespace {
 
 // Converts TriView::Orientation values to views::BoxLayout::Orientation values.
 views::BoxLayout::Orientation GetOrientation(TriView::Orientation orientation) {
   switch (orientation) {
     case TriView::Orientation::HORIZONTAL:
       return views::BoxLayout::kHorizontal;
     case TriView::Orientation::VERTICAL:
       return views::BoxLayout::kVertical;
   }
   // Required for some compilers.
   NOTREACHED();
   return views::BoxLayout::kHorizontal;
 }
 
+std::unique_ptr<views::LayoutManager> CreateDefaultLayoutManager(
+    TriView::Orientation orientation) {
+  auto box_layout =
+      base::MakeUnique<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 box_layout;
+}
+
 }  // namespace
 
 TriView::TriView() : TriView(0) {}
 
 TriView::TriView(int padding_between_containers)
     : TriView(Orientation::HORIZONTAL, padding_between_containers) {}
 
 TriView::TriView(Orientation orientation) : TriView(orientation, 0) {}
 
 TriView::TriView(Orientation orientation, int padding_between_containers)
@@ skipping 15 matching lines @@
   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);

[bruthig, 2016/11/10 18:33:40]

Just looking for confirmation, in your comment here
https://codereview.chromium.org/2487603005/diff/1/ash/common/system/tray/tray...
you said that is all that is need to fix the toggle?  I'm assuming this is also
needed so that the Toggle is top aligned.  Is that correct or is this not
needed?

[Evan Stade, 2016/11/10 19:18:05]

no, all we needed to do to fix the toggle was change the end container's
(wrapped) layout manager to center (change STRETCH to CENTER in the deleted
block of code at that comment). However since that makes that layout the same as
the default one (as defined by CreateDefaultLayoutManager in this file) we were
able to just delete that whole function.

This change here is needed for the top-alignment of all the containers.

[bruthig, 2016/11/10 20:51:16]

Acknowledged.

   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