[ash-md] Updated layout of Brightness and Audio system menu rows to the material design spec.

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"
 #include "ash/common/system/tray/tray_constants.h"
 #include "ash/common/system/tray/tray_popup_label_button.h"
 #include "ash/common/system/tray/tray_popup_label_button_border.h"
 #include "ash/common/wm_shell.h"
 #include "ui/views/animation/ink_drop_impl.h"
 #include "ui/views/border.h"
 #include "ui/views/controls/button/button.h"
 #include "ui/views/controls/button/label_button.h"
 #include "ui/views/controls/button/md_text_button.h"
 #include "ui/views/controls/image_view.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/controls/separator.h"
+#include "ui/views/controls/slider.h"
 #include "ui/views/layout/box_layout.h"
+#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 =
@@ skipping 58 matching lines @@
     ink_drop->SetShowHighlightOnHover(false);
     return std::move(ink_drop);
   }
 
   DISALLOW_COPY_AND_ASSIGN(BorderlessLabelButton);
 };
 
 }  // namespace
 
 TriView* TrayPopupUtils::CreateDefaultRowView() {
+  TriView* tri_view = CreateMultiTargetRowView();
+  tri_view->SetContainerBorder(TriView::Container::START,
+                               CreateDefaultBorder(TriView::Container::START));
+  tri_view->SetContainerBorder(TriView::Container::CENTER,
+                               CreateDefaultBorder(TriView::Container::CENTER));
+  tri_view->SetContainerBorder(TriView::Container::END,
+                               CreateDefaultBorder(TriView::Container::END));
+
+  tri_view->SetContainerLayout(
+      TriView::Container::START,
+      CreateDefaultLayoutManager(TriView::Container::START));
+  tri_view->SetContainerLayout(
+      TriView::Container::CENTER,
+      CreateDefaultLayoutManager(TriView::Container::CENTER));
+  tri_view->SetContainerLayout(
+      TriView::Container::END,
+      CreateDefaultLayoutManager(TriView::Container::END));
+
+  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));
 
-  ConfigureDefaultLayout(tri_view, TriView::Container::START);
-  ConfigureDefaultLayout(tri_view, TriView::Container::CENTER);
-  ConfigureDefaultLayout(tri_view, TriView::Container::END);
+  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,
+                               base::MakeUnique<views::FillLayout>());
 
   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.
   //
   // Text rendered on a non-opaque background looks ugly and it is possible for
   // labels to given a a clear canvas at paint time when an ink drop is visible.
   // See http://crbug.com/661714.
   label->SetSubpixelRenderingEnabled(false);
 
   return label;
 }
 
 views::ImageView* TrayPopupUtils::CreateMainImageView() {
   return new FixedSizedImageView(
       GetTrayConstant(TRAY_POPUP_ITEM_MAIN_IMAGE_CONTAINER_WIDTH),
       GetTrayConstant(TRAY_POPUP_ITEM_HEIGHT));
 }
 
 views::ImageView* TrayPopupUtils::CreateMoreImageView() {
-  views::ImageView* image = new FixedSizedImageView(
-      GetTrayConstant(TRAY_POPUP_ITEM_MORE_IMAGE_CONTAINER_WIDTH),
-      GetTrayConstant(TRAY_POPUP_ITEM_HEIGHT));
+  views::ImageView* image =
+      new FixedSizedImageView(GetTrayConstant(TRAY_POPUP_ITEM_MORE_IMAGE_SIZE),
+                              GetTrayConstant(TRAY_POPUP_ITEM_MORE_IMAGE_SIZE));
   image->EnableCanvasFlippingForRTLUI(true);
   return image;
 }
 
+views::Slider* TrayPopupUtils::CreateSlider(views::SliderListener* listener) {
+  const bool is_material = MaterialDesignController::IsSystemTrayMenuMaterial();
+  views::Slider* slider = views::Slider::CreateSlider(is_material, listener);
+  slider->set_focus_border_color(kFocusBorderColor);
+  if (is_material) {
+    slider->SetBorder(
+        views::CreateEmptyBorder(gfx::Insets(0, kTrayPopupSliderPaddingMD)));
+  } else {
+    slider->SetBorder(
+        views::CreateEmptyBorder(0, 0, 0, kTrayPopupPaddingBetweenItems));
+  }
+  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();
 }
 
-void TrayPopupUtils::ConfigureDefaultLayout(TriView* tri_view,
-                                            TriView::Container container) {
+std::unique_ptr<views::LayoutManager>
+TrayPopupUtils::CreateDefaultLayoutManager(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));
+    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:
-      tri_view->SetFlexForContainer(TriView::Container::CENTER, 1.f);
+      return nullptr;
       break;
     case TriView::Container::END:
-      tri_view->SetMinSize(
-          TriView::Container::END,
-          gfx::Size(GetTrayConstant(TRAY_POPUP_ITEM_MIN_END_WIDTH), 0));
+      return views::CreateEmptyBorder(
+          0, GetTrayConstant(TRAY_POPUP_ITEM_MORE_REGION_HORIZONTAL_INSET), 0,
+          GetTrayConstant(TRAY_POPUP_ITEM_MORE_REGION_HORIZONTAL_INSET));
       break;
   }
-
-  tri_view->SetContainerLayout(container, CreateLayoutManager(container));
+  // Required by some compilers.
+  NOTREACHED();
+  return nullptr;
 }
 
 }  // namespace ash