Adjust TriView.

ash/common/system/tray/tray_popup_utils.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/tray_popup_utils.h"
 
 #include "ash/common/ash_constants.h"
 #include "ash/common/material_design/material_design_controller.h"
 #include "ash/common/session/session_state_delegate.h"
 #include "ash/common/system/tray/fixed_sized_image_view.h"
@@ skipping 21 matching lines @@
   // TODO(bruthig): Use constants instead of magic numbers.
   views::BoxLayout* box_layout =
       new views::BoxLayout(views::BoxLayout::kVertical, 4, 8, 4);
   box_layout->set_main_axis_alignment(
       views::BoxLayout::MAIN_AXIS_ALIGNMENT_CENTER);
   box_layout->set_cross_axis_alignment(
       views::BoxLayout::CROSS_AXIS_ALIGNMENT_STRETCH);
   return std::unique_ptr<views::LayoutManager>(box_layout);
 }
 
-// Creates a layout manager that positions Views horizontally. The Views will be

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

Just as a heads up this CL: https://codereview.chromium.org/2482043002 is
changing some of these methods around too.  Not sure how much of a conflict
there will be.

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

Acknowledged.

-// centered along the horizontal and vertical axis.
-std::unique_ptr<views::LayoutManager> CreateDefaultEndsLayoutManager() {
-  views::BoxLayout* box_layout =
-      new views::BoxLayout(views::BoxLayout::kHorizontal, 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_STRETCH);

[Evan Stade, 2016/11/09 23:32:15]

The code does not match the comment above the function. To fix the toggle
button, all that's needed is to change this STRETCH to CENTER (matching the
comment).

Having done that, CreateDefaultEndsLayoutManager returns the same thing as
TriView's default layout manager, so it's unnecessary and I deleted it.

-  return std::unique_ptr<views::LayoutManager>(box_layout);
+void ConfigureDefaultLayout(TriView* tri_view, TriView::Container container) {

[Evan Stade, 2016/11/09 23:32:15]

the rest of the changes in this file allow the center container to grow without
displacing the side containers.

+  const int min_height = GetTrayConstant(TRAY_POPUP_ITEM_HEIGHT);
+  switch (container) {
+    case TriView::Container::START:
+      tri_view->SetMinSize(
+          TriView::Container::START,
+          gfx::Size(GetTrayConstant(TRAY_POPUP_ITEM_MIN_START_WIDTH),
+                    min_height));
+      break;
+    case TriView::Container::CENTER:
+      tri_view->SetContainerLayout(container,
+                                   CreateDefaultCenterLayoutManager());
+      tri_view->SetFlexForContainer(TriView::Container::CENTER, 1.f);
+      tri_view->SetMinSize(TriView::Container::CENTER,
+                           gfx::Size(0, min_height));
+      break;
+    case TriView::Container::END:
+      tri_view->SetMinSize(
+          TriView::Container::END,
+          gfx::Size(GetTrayConstant(TRAY_POPUP_ITEM_MIN_END_WIDTH),
+                    min_height));
+      break;
+  }
 }
 
 class BorderlessLabelButton : public views::LabelButton {
  public:
   BorderlessLabelButton(views::ButtonListener* listener,
                         const base::string16& text)
       : LabelButton(listener, text) {
     if (MaterialDesignController::IsSystemTrayMenuMaterial()) {
       SetInkDropMode(views::InkDropHostView::InkDropMode::ON);
       set_has_ink_drop_action_on_click(true);
@@ skipping 35 matching lines @@
 };
 
 }  // namespace
 
 TriView* TrayPopupUtils::CreateDefaultRowView() {
   TriView* tri_view = new TriView(0 /* padding_between_items */);
 
   tri_view->SetInsets(
       gfx::Insets(0, GetTrayConstant(TRAY_POPUP_ITEM_LEFT_INSET), 0,
                   GetTrayConstant(TRAY_POPUP_ITEM_RIGHT_INSET)));
-  tri_view->SetMinCrossAxisSize(GetTrayConstant(TRAY_POPUP_ITEM_HEIGHT));
 
   ConfigureDefaultLayout(tri_view, TriView::Container::START);
   ConfigureDefaultLayout(tri_view, TriView::Container::CENTER);
   ConfigureDefaultLayout(tri_view, TriView::Container::END);
 
   return tri_view;
 }
 
-std::unique_ptr<views::LayoutManager> TrayPopupUtils::CreateLayoutManager(
-    TriView::Container container) {
-  switch (container) {
-    case TriView::Container::START:
-    case TriView::Container::END:
-      return CreateDefaultEndsLayoutManager();
-    case TriView::Container::CENTER:
-      return CreateDefaultCenterLayoutManager();
-  }
-  // Required by some compilers.
-  NOTREACHED();
-  return nullptr;
-}
-
 views::Label* TrayPopupUtils::CreateDefaultLabel() {
   views::Label* label = new views::Label();
   label->SetHorizontalAlignment(gfx::ALIGN_LEFT);
   label->SetBorder(views::CreateEmptyBorder(0, kTrayPopupLabelHorizontalPadding,
                                             0,
                                             kTrayPopupLabelHorizontalPadding));
 
   // TODO(bruthig): Fix this so that |label| uses the kBackgroundColor to
   // perform subpixel rendering instead of disabling subpixel rendering.
   //
@@ skipping 46 matching lines @@
 
 bool TrayPopupUtils::CanOpenWebUISettings(LoginStatus status) {
   // TODO(tdanderson): Consider moving this into WmShell, or introduce a
   // CanShowSettings() method in each delegate type that has a
   // ShowSettings() method.
   return status != LoginStatus::NOT_LOGGED_IN &&
          status != LoginStatus::LOCKED &&
          !WmShell::Get()->GetSessionStateDelegate()->IsInSecondaryLoginScreen();
 }
 
-void TrayPopupUtils::ConfigureDefaultLayout(TriView* tri_view,
-                                            TriView::Container container) {
-  switch (container) {
-    case TriView::Container::START:
-      tri_view->SetMinSize(
-          TriView::Container::START,
-          gfx::Size(GetTrayConstant(TRAY_POPUP_ITEM_MIN_START_WIDTH), 0));
-      break;
-    case TriView::Container::CENTER:
-      tri_view->SetFlexForContainer(TriView::Container::CENTER, 1.f);
-      break;
-    case TriView::Container::END:
-      tri_view->SetMinSize(
-          TriView::Container::END,
-          gfx::Size(GetTrayConstant(TRAY_POPUP_ITEM_MIN_END_WIDTH), 0));
-      break;
-  }
-
-  tri_view->SetContainerLayout(container, CreateLayoutManager(container));
-}
-
 }  // namespace ash