OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "ash/system/tray_update.h" | 5 #include "ash/system/tray_update.h" |
6 | 6 |
7 #include "ash/shell.h" | 7 #include "ash/shell.h" |
8 #include "ash/system/tray/system_tray_delegate.h" | 8 #include "ash/system/tray/system_tray_delegate.h" |
9 #include "ash/system/tray/tray_constants.h" | 9 #include "ash/system/tray/tray_constants.h" |
10 #include "ash/system/tray/tray_views.h" | 10 #include "ash/system/tray/tray_views.h" |
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
59 : TrayImageItem(IDR_AURA_UBER_TRAY_UPDATE) { | 59 : TrayImageItem(IDR_AURA_UBER_TRAY_UPDATE) { |
60 } | 60 } |
61 | 61 |
62 TrayUpdate::~TrayUpdate() {} | 62 TrayUpdate::~TrayUpdate() {} |
63 | 63 |
64 bool TrayUpdate::GetInitialVisibility() { | 64 bool TrayUpdate::GetInitialVisibility() { |
65 return Shell::GetInstance()->tray_delegate()->SystemShouldUpgrade(); | 65 return Shell::GetInstance()->tray_delegate()->SystemShouldUpgrade(); |
66 } | 66 } |
67 | 67 |
68 views::View* TrayUpdate::CreateDefaultView(user::LoginStatus status) { | 68 views::View* TrayUpdate::CreateDefaultView(user::LoginStatus status) { |
| 69 if (!Shell::GetInstance()->tray_delegate()->SystemShouldUpgrade()) |
| 70 return NULL; |
69 default_.reset(new UpdateView); | 71 default_.reset(new UpdateView); |
70 return default_.get(); | 72 return default_.get(); |
71 } | 73 } |
72 | 74 |
73 void TrayUpdate::DestroyDefaultView() { | 75 void TrayUpdate::DestroyDefaultView() { |
74 default_.reset(); | 76 default_.reset(); |
75 } | 77 } |
76 | 78 |
77 void TrayUpdate::OnUpdateRecommended() { | 79 void TrayUpdate::OnUpdateRecommended() { |
78 image_view()->SetVisible(true); | 80 image_view()->SetVisible(true); |
79 } | 81 } |
80 | 82 |
81 } // namespace internal | 83 } // namespace internal |
82 } // namespace ash | 84 } // namespace ash |
OLD | NEW |