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 51 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
62 | 62 |
63 TrayUpdate::~TrayUpdate() {} | 63 TrayUpdate::~TrayUpdate() {} |
64 | 64 |
65 bool TrayUpdate::GetInitialVisibility() { | 65 bool TrayUpdate::GetInitialVisibility() { |
66 return Shell::GetInstance()->tray_delegate()->SystemShouldUpgrade(); | 66 return Shell::GetInstance()->tray_delegate()->SystemShouldUpgrade(); |
67 } | 67 } |
68 | 68 |
69 views::View* TrayUpdate::CreateDefaultView(user::LoginStatus status) { | 69 views::View* TrayUpdate::CreateDefaultView(user::LoginStatus status) { |
70 if (!Shell::GetInstance()->tray_delegate()->SystemShouldUpgrade()) | 70 if (!Shell::GetInstance()->tray_delegate()->SystemShouldUpgrade()) |
71 return NULL; | 71 return NULL; |
72 default_.reset(new UpdateView); | 72 return new UpdateView; |
73 return default_.get(); | |
74 } | 73 } |
75 | 74 |
76 void TrayUpdate::DestroyDefaultView() { | 75 void TrayUpdate::DestroyDefaultView() { |
77 default_.reset(); | |
78 } | 76 } |
79 | 77 |
80 void TrayUpdate::OnUpdateRecommended() { | 78 void TrayUpdate::OnUpdateRecommended() { |
81 tray_view()->SetVisible(true); | 79 tray_view()->SetVisible(true); |
82 } | 80 } |
83 | 81 |
84 } // namespace internal | 82 } // namespace internal |
85 } // namespace ash | 83 } // namespace ash |
OLD | NEW |