[Chrome OS MD] Update Cast and VPN to follow MD layout

ash/common/system/chromeos/screen_security/screen_tray_item.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/screen_security/screen_tray_item.h"
 
 #include "ash/common/material_design/material_design_controller.h"
 #include "ash/common/shelf/wm_shelf_util.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_item_style.h"
 #include "ash/common/system/tray/tray_popup_utils.h"
 #include "ash/resources/vector_icons/vector_icons.h"
 #include "grit/ash_resources.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/paint_vector_icon.h"
 #include "ui/message_center/message_center.h"
 #include "ui/views/controls/button/label_button.h"
 #include "ui/views/controls/label.h"
-#include "ui/views/layout/box_layout.h"
-
-namespace {
-const int kStopButtonRightPadding = 18;
-}  // namespace
+#include "ui/views/layout/fill_layout.h"
 
 namespace ash {
 namespace tray {
 
 // ScreenTrayView implementations.
 ScreenTrayView::ScreenTrayView(ScreenTrayItem* screen_tray_item)
     : TrayItemView(screen_tray_item), screen_tray_item_(screen_tray_item) {
   CreateImageView();
   if (MaterialDesignController::UseMaterialDesignSystemIcons()) {
     image_view()->SetImage(
@@ skipping 16 matching lines @@
 ScreenStatusView::ScreenStatusView(ScreenTrayItem* screen_tray_item,
                                    const base::string16& label_text,
                                    const base::string16& stop_button_text)
     : screen_tray_item_(screen_tray_item),
       icon_(nullptr),
       label_(nullptr),
       stop_button_(nullptr),
       label_text_(label_text),
       stop_button_text_(stop_button_text) {
   CreateItems();
+  TriView* tri_view(TrayPopupUtils::CreateDefaultRowView());
+  SetLayoutManager(new views::FillLayout);
+  AddChildView(tri_view);
+  tri_view->AddView(TriView::Container::START, icon_);
+  tri_view->AddView(TriView::Container::CENTER, label_);
+  tri_view->AddView(TriView::Container::END, stop_button_);

[tdanderson, 2016/11/25 00:45:41]

Do you also need to call tri_view->SetContainerVisible(TriView::Container::END,
true) ?

+  tri_view->SetContainerBorder(
+      TriView::Container::END,
+      views::CreateEmptyBorder(0, 0, 0, kTrayPopupButtonEndMargin));
   if (screen_tray_item_)
     UpdateFromScreenTrayItem();
 }
 
 ScreenStatusView::~ScreenStatusView() {}
 
 void ScreenStatusView::ButtonPressed(views::Button* sender,
                                      const ui::Event& event) {
   DCHECK(sender == stop_button_);
   screen_tray_item_->Stop();
   screen_tray_item_->RecordStoppedFromDefaultViewMetric();
 }
 
 void ScreenStatusView::CreateItems() {
   const bool use_md = MaterialDesignController::IsSystemTrayMenuMaterial();
-  if (!use_md)
+  icon_ = TrayPopupUtils::CreateMainImageView();
+  if (!use_md) {
     set_background(views::Background::CreateSolidBackground(kBackgroundColor));
-
-  auto layout =
-      new views::BoxLayout(views::BoxLayout::kHorizontal, 0, 0,
-                           use_md ? kTrayPopupPaddingBetweenItems : 0);
-  layout->set_cross_axis_alignment(
-      views::BoxLayout::CROSS_AXIS_ALIGNMENT_CENTER);
-  SetLayoutManager(layout);
-  SetBorder(views::CreateEmptyBorder(
-      0, kTrayPopupPaddingHorizontal, 0,
-      use_md ? kTrayPopupButtonEndMargin : kStopButtonRightPadding));
-
-  icon_ = TrayPopupUtils::CreateMainImageView();
-  if (use_md) {
-    icon_->SetImage(
-        gfx::CreateVectorIcon(kSystemMenuScreenShareIcon, kMenuIconColor));
-  } else {
     ui::ResourceBundle& bundle = ui::ResourceBundle::GetSharedInstance();
     icon_->SetImage(bundle.GetImageNamed(IDR_AURA_UBER_TRAY_SCREENSHARE_DARK)
                         .ToImageSkia());
   }
-  AddChildView(icon_);
 
-  label_ = new views::Label;
-  label_->SetHorizontalAlignment(gfx::ALIGN_LEFT);
+  label_ = TrayPopupUtils::CreateDefaultLabel();
   label_->SetMultiLine(true);
   label_->SetText(label_text_);
-  if (!use_md) {
-    label_->SetBorder(
-        views::CreateEmptyBorder(0, kTrayPopupPaddingBetweenItems, 0, 0));
-  }
-  AddChildView(label_);
-  layout->SetFlexForView(label_, 1);
 
   stop_button_ = TrayPopupUtils::CreateTrayPopupButton(this, stop_button_text_);
-  AddChildView(stop_button_);
 }
 
 void ScreenStatusView::UpdateFromScreenTrayItem() {
   // Hide the notification bubble when the ash tray bubble opens.
   screen_tray_item_->HideNotificationView();
   SetVisible(screen_tray_item_->is_started());
 }
 
 void ScreenStatusView::OnNativeThemeChanged(const ui::NativeTheme* theme) {
   if (!MaterialDesignController::IsSystemTrayMenuMaterial()) {
     views::View::OnNativeThemeChanged(theme);
     return;
   }
+
   if (theme) {
     TrayPopupItemStyle style(theme,
                              TrayPopupItemStyle::FontStyle::DEFAULT_VIEW_LABEL);
+    icon_->SetImage(gfx::CreateVectorIcon(kSystemMenuScreenShareIcon,

[tdanderson, 2016/11/25 00:45:41]

As discussed remove this line, and after line 81 in CreateItems() you should
have:

icon_->SetImage(gfx::CreateVectorIcon(kSystemMenuScreenShareIcon,
TrayPopupItemStyle::GetIconColor(TrayPopupItemStyle::ColorStyle::ACTIVE)));

+                                          style.GetIconColor()));
     style.SetupLabel(label_);
   }
 }
 
 ScreenNotificationDelegate::ScreenNotificationDelegate(
     ScreenTrayItem* screen_tray)
     : screen_tray_(screen_tray) {}
 
 ScreenNotificationDelegate::~ScreenNotificationDelegate() {}
 
@@ skipping 66 matching lines @@
 
 void ScreenTrayItem::DestroyTrayView() {
   tray_view_ = nullptr;
 }
 
 void ScreenTrayItem::DestroyDefaultView() {
   default_view_ = nullptr;
 }
 
 }  // namespace ash