[ash-md] Fixed Label::GetTextSize() to account for insets.

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/fill_layout.h"
 
+#include "base/strings/utf_string_conversions.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(
         gfx::CreateVectorIcon(kSystemTrayScreenShareIcon, kTrayIconColor));
   } else {
     image_view()->SetImage(ui::ResourceBundle::GetSharedInstance()
                                .GetImageNamed(IDR_AURA_UBER_TRAY_SCREENSHARE)
                                .ToImageSkia());
   }
   Update();
 }
 
 ScreenTrayView::~ScreenTrayView() {}
 
 void ScreenTrayView::Update() {
   SetVisible(screen_tray_item_->is_started());
+  SetVisible(true);
 }
 
 // ScreenStatusView implementations.
 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) {
+  label_text_ = base::ASCIIToUTF16(
+      "Google Hangouts is sharing a window with hangouts.google.com. Google "
+      "Hangouts is sharing a window with hangouts.google.com. Google Hangouts "
+      "is sharing a window with hangouts.google.com. Google Hangouts is "
+      "sharing a window with hangouts.google.com.");
   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_);
   tri_view->SetContainerBorder(
       TriView::Container::END,
       views::CreateEmptyBorder(0, 0, 0, kTrayPopupButtonEndMargin));
   if (screen_tray_item_)
     UpdateFromScreenTrayItem();
+  label_->SizeToFit(225);
 }
 
 ScreenStatusView::~ScreenStatusView() {}
 
 void ScreenStatusView::ButtonPressed(views::Button* sender,
                                      const ui::Event& event) {
   DCHECK(sender == stop_button_);
   screen_tray_item_->Stop();
   screen_tray_item_->RecordStoppedFromDefaultViewMetric();
 }
@@ skipping 15 matching lines @@
   label_->SetMultiLine(true);
   label_->SetText(label_text_);
 
   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());
+  SetVisible(true);
 }
 
 void ScreenStatusView::OnNativeThemeChanged(const ui::NativeTheme* theme) {
   if (!MaterialDesignController::IsSystemTrayMenuMaterial()) {
     views::View::OnNativeThemeChanged(theme);
     return;
   }
 
   if (theme) {
     TrayPopupItemStyle style(theme,
@@ skipping 77 matching lines @@
 
 void ScreenTrayItem::DestroyTrayView() {
   tray_view_ = nullptr;
 }
 
 void ScreenTrayItem::DestroyDefaultView() {
   default_view_ = nullptr;
 }
 
 }  // namespace ash