[ash-md] Fixed multi line label layout for system tray cast rows.

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"
@@ skipping 40 matching lines @@
       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_);
+  // TODO(bruthig): Multiline Labels don't lay out well with borders so we add
+  // the border to the Label's container instead. See https://crbug.com/678337 &
+  // https://crbug.com/682221.
+  tri_view->SetContainerBorder(
+      TriView::Container::CENTER,
+      views::CreateEmptyBorder(0, 0, 0, kTrayPopupLabelRightPadding));
   tri_view->AddView(TriView::Container::CENTER, label_);
   tri_view->AddView(TriView::Container::END, stop_button_);
   tri_view->SetContainerBorder(
       TriView::Container::END,
       views::CreateEmptyBorder(0, 0, 0, kTrayPopupButtonEndMargin));
   if (screen_tray_item_)
     UpdateFromScreenTrayItem();
 }
 
 ScreenStatusView::~ScreenStatusView() {}
@@ skipping 14 matching lines @@
   if (!use_md) {
     set_background(views::Background::CreateSolidBackground(kBackgroundColor));
     ui::ResourceBundle& bundle = ui::ResourceBundle::GetSharedInstance();
     icon_->SetImage(bundle.GetImageNamed(IDR_AURA_UBER_TRAY_SCREENSHARE_DARK)
                         .ToImageSkia());
   }
 
   label_ = TrayPopupUtils::CreateDefaultLabel();
   label_->SetMultiLine(true);
   label_->SetText(label_text_);
+  // TODO(bruthig): Multiline Labels don't lay out well with borders.
+  // See https://crbug.com/678337 & https://crbug.com/682221.
+  label_->SetBorder(nullptr);
 
   stop_button_ = TrayPopupUtils::CreateTrayPopupButton(this, stop_button_text_);
 }
 
 void ScreenStatusView::UpdateFromScreenTrayItem() {
   // Hide the notification bubble when the ash tray bubble opens.
   screen_tray_item_->HideNotificationView();
   SetVisible(screen_tray_item_->is_started());
 }
 
@@ skipping 85 matching lines @@
 
 void ScreenTrayItem::DestroyTrayView() {
   tray_view_ = nullptr;
 }
 
 void ScreenTrayItem::DestroyDefaultView() {
   default_view_ = nullptr;
 }
 
 }  // namespace ash