| Index: ash/common/system/chromeos/screen_security/screen_tray_item.cc
|
| diff --git a/ash/common/system/chromeos/screen_security/screen_tray_item.cc b/ash/common/system/chromeos/screen_security/screen_tray_item.cc
|
| index 55b20a1708e5aa55850b2174d671bf32e644f3f2..a07bbd44dd04cbd82eb3569423b742f400f4ac2c 100644
|
| --- a/ash/common/system/chromeos/screen_security/screen_tray_item.cc
|
| +++ b/ash/common/system/chromeos/screen_security/screen_tray_item.cc
|
| @@ -19,6 +19,8 @@
|
| #include "ui/views/controls/label.h"
|
| #include "ui/views/layout/fill_layout.h"
|
|
|
| +#include "base/strings/utf_string_conversions.h"
|
| +
|
| namespace ash {
|
| namespace tray {
|
|
|
| @@ -41,6 +43,7 @@ ScreenTrayView::~ScreenTrayView() {}
|
|
|
| void ScreenTrayView::Update() {
|
| SetVisible(screen_tray_item_->is_started());
|
| + SetVisible(true);
|
| }
|
|
|
| // ScreenStatusView implementations.
|
| @@ -53,6 +56,11 @@ ScreenStatusView::ScreenStatusView(ScreenTrayItem* screen_tray_item,
|
| 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);
|
| @@ -65,6 +73,7 @@ ScreenStatusView::ScreenStatusView(ScreenTrayItem* screen_tray_item,
|
| views::CreateEmptyBorder(0, 0, 0, kTrayPopupButtonEndMargin));
|
| if (screen_tray_item_)
|
| UpdateFromScreenTrayItem();
|
| + label_->SizeToFit(225);
|
| }
|
|
|
| ScreenStatusView::~ScreenStatusView() {}
|
| @@ -100,6 +109,7 @@ 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) {
|
|
|