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 14 matching lines @@
 #include "ui/views/layout/fill_layout.h"
 
 namespace ash {
 
 namespace {
 
 // Creates a layout manager that positions Views vertically. The Views will be
 // stretched horizontally and centered vertically.
 std::unique_ptr<views::LayoutManager> CreateDefaultCenterLayoutManager() {
   // TODO(bruthig): Use constants instead of magic numbers.
-  views::BoxLayout* box_layout =
-      new views::BoxLayout(views::BoxLayout::kVertical, 4, 8, 4);
+  auto box_layout =
+      base::MakeUnique<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);
+  return std::move(box_layout);
 }
 
 // Creates a layout manager that positions Views horizontally. The Views will be
 // 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);
+  auto box_layout = base::MakeUnique<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);
-  return std::unique_ptr<views::LayoutManager>(box_layout);
+      views::BoxLayout::CROSS_AXIS_ALIGNMENT_CENTER);
+  return std::move(box_layout);
+}
+
+std::unique_ptr<views::LayoutManager> CreateDefaultLayoutManager(
+    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;
+}
+
+// Configures the default size and flex value for the specified |container|
+// of the given |tri_view|. Used by CreateDefaultRowView().
+void ConfigureDefaultSizeAndFlex(TriView* tri_view,
+                                 TriView::Container container) {
+  int min_width = 0;
+  switch (container) {
+    case TriView::Container::START:
+      min_width = GetTrayConstant(TRAY_POPUP_ITEM_MIN_START_WIDTH);
+      break;
+    case TriView::Container::CENTER:
+      tri_view->SetFlexForContainer(TriView::Container::CENTER, 1.f);
+      break;
+    case TriView::Container::END:
+      min_width = GetTrayConstant(TRAY_POPUP_ITEM_MIN_END_WIDTH);
+      break;
+  }
+
+  tri_view->SetMinSize(
+      container, gfx::Size(min_width, GetTrayConstant(TRAY_POPUP_ITEM_HEIGHT)));
 }
 
 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 57 matching lines @@
 
   return tri_view;
 }
 
 TriView* TrayPopupUtils::CreateMultiTargetRowView() {
   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));
 
   ConfigureDefaultSizeAndFlex(tri_view, TriView::Container::START);
   ConfigureDefaultSizeAndFlex(tri_view, TriView::Container::CENTER);
   ConfigureDefaultSizeAndFlex(tri_view, TriView::Container::END);
 
   tri_view->SetContainerLayout(TriView::Container::START,
                                base::MakeUnique<views::FillLayout>());
   tri_view->SetContainerLayout(TriView::Container::CENTER,
                                base::MakeUnique<views::FillLayout>());
   tri_view->SetContainerLayout(TriView::Container::END,
@@ skipping 48 matching lines @@
   return slider;
 }
 
 void TrayPopupUtils::ConfigureContainer(TriView::Container container,
                                         views::View* container_view) {
   container_view->SetBorder(CreateDefaultBorder(container));
   container_view->SetLayoutManager(
       CreateDefaultLayoutManager(container).release());
 }
 
-void TrayPopupUtils::ConfigureDefaultSizeAndFlex(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;
-  }
-}
-
 views::LabelButton* TrayPopupUtils::CreateTrayPopupBorderlessButton(
     views::ButtonListener* listener,
     const base::string16& text) {
   return new BorderlessLabelButton(listener, text);
 }
 
 views::LabelButton* TrayPopupUtils::CreateTrayPopupButton(
     views::ButtonListener* listener,
     const base::string16& text) {
   if (!MaterialDesignController::IsSystemTrayMenuMaterial())
@@ skipping 14 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();
 }
 
-std::unique_ptr<views::LayoutManager>
-TrayPopupUtils::CreateDefaultLayoutManager(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;
-}
-
 std::unique_ptr<views::Border> TrayPopupUtils::CreateDefaultBorder(
     TriView::Container container) {
   switch (container) {
     case TriView::Container::START:
       // TODO(bruthig): Update the 'Main' images to have a fixed size that is
       // just the painted size and add a border.
       return nullptr;
       break;
     case TriView::Container::CENTER:
       return nullptr;
       break;
     case TriView::Container::END:
       return views::CreateEmptyBorder(
           0, GetTrayConstant(TRAY_POPUP_ITEM_MORE_REGION_HORIZONTAL_INSET), 0,
           GetTrayConstant(TRAY_POPUP_ITEM_MORE_REGION_HORIZONTAL_INSET));
       break;
   }
   // Required by some compilers.
   NOTREACHED();
   return nullptr;
 }
 
 }  // namespace ash