Adjust TriView.

ash/common/system/tray/tri_view.cc

Index: ash/common/system/tray/tri_view.cc
diff --git a/ash/common/system/tray/tri_view.cc b/ash/common/system/tray/tri_view.cc
index b4742673c8652afb1c938675fd0cff11a7d2d316..5f9bba6c6653d6107c6518735eebd81ea4cb7324 100644
--- a/ash/common/system/tray/tri_view.cc
+++ b/ash/common/system/tray/tri_view.cc
@@ -27,6 +27,17 @@ views::BoxLayout::Orientation GetOrientation(TriView::Orientation orientation) {
   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) {}
@@ -62,6 +73,8 @@ TriView::TriView(Orientation orientation, int padding_between_containers)
   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;
@@ -71,10 +84,6 @@ 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);
 }
@@ -131,22 +140,11 @@ void TriView::ViewHierarchyChanged(
   }
 }
 
-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) const {
-  return const_cast<views::View*>(child_at(static_cast<int>(container)));
+views::View* TriView::GetContainer(Container container) {
+  return 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_;