| Index: ash/common/system/update/tray_update.cc
|
| diff --git a/ash/common/system/update/tray_update.cc b/ash/common/system/update/tray_update.cc
|
| index 0f05af21f0c63e9c77f7e9562cd072f1e0f1b134..6325d1ab1abd7869b29401511663efe32458f3b4 100644
|
| --- a/ash/common/system/update/tray_update.cc
|
| +++ b/ash/common/system/update/tray_update.cc
|
| @@ -80,7 +80,8 @@ SkColor IconColorForUpdateSeverity(UpdateInfo::UpdateSeverity severity,
|
|
|
| class UpdateView : public ActionableView {
|
| public:
|
| - explicit UpdateView(const UpdateInfo& info) {
|
| + UpdateView(SystemTrayItem* owner, const UpdateInfo& info)
|
| + : ActionableView(owner) {
|
| SetLayoutManager(new views::BoxLayout(views::BoxLayout::kHorizontal,
|
| kTrayPopupPaddingHorizontal, 0,
|
| kTrayPopupPaddingBetweenItems));
|
| @@ -115,6 +116,7 @@ class UpdateView : public ActionableView {
|
| WmShell::Get()->system_tray_delegate()->RequestRestartForUpdate();
|
| WmShell::Get()->RecordUserMetricsAction(
|
| UMA_STATUS_AREA_OS_UPDATE_DEFAULT_SELECTED);
|
| + CloseSystemBubble();
|
| return true;
|
| }
|
|
|
| @@ -141,7 +143,7 @@ bool TrayUpdate::GetInitialVisibility() {
|
| views::View* TrayUpdate::CreateDefaultView(LoginStatus status) {
|
| UpdateInfo info;
|
| WmShell::Get()->system_tray_delegate()->GetSystemUpdateInfo(&info);
|
| - return info.update_required ? new UpdateView(info) : nullptr;
|
| + return info.update_required ? new UpdateView(this, info) : nullptr;
|
| }
|
|
|
| void TrayUpdate::OnUpdateRecommended(const UpdateInfo& info) {
|
|
|