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

ash/common/system/chromeos/brightness/tray_brightness.cc

 // Copyright 2013 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/chromeos/brightness/tray_brightness.h"
 
 #include <algorithm>
 
-#include "ash/common/ash_constants.h"
 #include "ash/common/material_design/material_design_controller.h"
 #include "ash/common/shell_observer.h"
 #include "ash/common/system/brightness_control_delegate.h"
-#include "ash/common/system/tray/fixed_sized_image_view.h"
-#include "ash/common/system/tray/system_tray_delegate.h"
 #include "ash/common/system/tray/tray_constants.h"
+#include "ash/common/system/tray/tray_popup_utils.h"
+#include "ash/common/system/tray/tri_view.h"
 #include "ash/common/wm/maximize_mode/maximize_mode_controller.h"
 #include "ash/common/wm_shell.h"
 #include "ash/resources/vector_icons/vector_icons.h"
 #include "base/bind.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/dbus/power_manager_client.h"
 #include "grit/ash_resources.h"
 #include "grit/ash_strings.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/display/display.h"
 #include "ui/gfx/image/image.h"
 #include "ui/gfx/paint_vector_icon.h"
-#include "ui/views/border.h"
-#include "ui/views/controls/button/image_button.h"
 #include "ui/views/controls/image_view.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/controls/slider.h"
-#include "ui/views/layout/box_layout.h"
+#include "ui/views/layout/fill_layout.h"
 #include "ui/views/view.h"
 
 namespace ash {
 namespace tray {
 namespace {
 
 // We don't let the screen brightness go lower than this when it's being
 // adjusted via the slider.  Otherwise, if the user doesn't know about the
 // brightness keys, they may turn the backlight off and not know how to turn it
 // back on.
@@ skipping 46 matching lines @@
   // Last brightness level that we observed, in the range [0.0, 100.0].
   double last_percent_;
 
   DISALLOW_COPY_AND_ASSIGN(BrightnessView);
 };
 
 BrightnessView::BrightnessView(bool default_view, double initial_percent)
     : dragging_(false),
       is_default_view_(default_view),
       last_percent_(initial_percent) {
-  SetLayoutManager(new views::BoxLayout(views::BoxLayout::kHorizontal,
-                                        kTrayPopupPaddingHorizontal, 0,
-                                        kTrayPopupPaddingBetweenItems));
+  SetLayoutManager(new views::FillLayout);
+  // Use CreateMultiTargetRowView() instead of CreateDefaultRowView() because
+  // that's what the audio row uses and we want the two rows to layout the same.

[tdanderson, 2016/11/09 01:38:33]

I interpret this as "the sliders should be the same width and x-offset" but
that's not always true (volume slider is shorter if there is a device type
icon). Consider re-wording this comment.

[bruthig, 2016/11/10 02:54:54]

Done.

+  TriView* tri_view = TrayPopupUtils::CreateMultiTargetRowView();
+  AddChildView(tri_view);
 
   ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
-  views::ImageView* icon =
-      new FixedSizedImageView(0, GetTrayConstant(TRAY_POPUP_ITEM_HEIGHT));
+  views::ImageView* icon = TrayPopupUtils::CreateMainImageView();
   if (MaterialDesignController::IsSystemTrayMenuMaterial()) {
     icon->SetImage(
         gfx::CreateVectorIcon(kSystemMenuBrightnessIcon, kMenuIconColor));
   } else {
     icon->SetImage(
         rb.GetImageNamed(IDR_AURA_UBER_TRAY_BRIGHTNESS).ToImageSkia());
   }
-  AddChildView(icon);
-  slider_ = views::Slider::CreateSlider(
-      ash::MaterialDesignController::IsSystemTrayMenuMaterial(), this);
-  if (ash::MaterialDesignController::IsSystemTrayMenuMaterial()) {
-    slider_->SetBorder(views::CreateEmptyBorder(
-        gfx::Insets(0, kTrayPopupSliderPaddingMD) + slider_->GetInsets()));
-  }
-  slider_->set_focus_border_color(kFocusBorderColor);
+  tri_view->AddView(TriView::Container::START, icon);
+
+  slider_ = TrayPopupUtils::CreateSlider(this);
   slider_->SetValue(static_cast<float>(initial_percent / 100.0));
   slider_->SetAccessibleName(
       rb.GetLocalizedString(IDS_ASH_STATUS_TRAY_BRIGHTNESS));
-  AddChildView(slider_);
+  tri_view->AddView(TriView::Container::CENTER, slider_);
 
   if (MaterialDesignController::IsSystemTrayMenuMaterial()) {
     SetVisible(true);
   } else {
     if (is_default_view_) {
       WmShell::Get()->AddShellObserver(this);
       SetVisible(WmShell::Get()
                      ->maximize_mode_controller()
                      ->IsMaximizeModeWindowManagerEnabled());
     }
   }
+
+  if (!is_default_view_)
+    tri_view->SetContainerVisible(TriView::Container::END, false);
 }
 
 BrightnessView::~BrightnessView() {
   if (is_default_view_)
     WmShell::Get()->RemoveShellObserver(this);
 }
 
 void BrightnessView::SetBrightnessPercent(double percent) {
   last_percent_ = percent;
   if (!dragging_)
@@ skipping 142 matching lines @@
   if (!display::Display::HasInternalDisplay())
     return;
 
   if (brightness_view_)
     SetDetailedViewCloseDelay(kTrayPopupAutoCloseDelayInSeconds);
   else
     PopupDetailedView(kTrayPopupAutoCloseDelayInSeconds, false);
 }
 
 }  // namespace ash