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 #ifndef ASH_SYSTEM_TRAY_UPDATE_H_ | 5 #ifndef ASH_SYSTEM_TRAY_UPDATE_H_ |
6 #define ASH_SYSTEM_TRAY_UPDATE_H_ | 6 #define ASH_SYSTEM_TRAY_UPDATE_H_ |
7 | 7 |
8 #include "ash/system/tray/tray_image_item.h" | 8 #include "ash/system/tray/tray_image_item.h" |
9 #include "ash/system/user/update_observer.h" | 9 #include "ash/system/user/update_observer.h" |
10 #include "base/memory/scoped_ptr.h" | 10 #include "base/memory/scoped_ptr.h" |
(...skipping 12 matching lines...) Expand all Loading... |
23 | 23 |
24 class TrayUpdate : public TrayImageItem, | 24 class TrayUpdate : public TrayImageItem, |
25 public UpdateObserver { | 25 public UpdateObserver { |
26 public: | 26 public: |
27 TrayUpdate(); | 27 TrayUpdate(); |
28 virtual ~TrayUpdate(); | 28 virtual ~TrayUpdate(); |
29 | 29 |
30 private: | 30 private: |
31 // Overridden from TrayImageItem. | 31 // Overridden from TrayImageItem. |
32 virtual bool GetInitialVisibility() OVERRIDE; | 32 virtual bool GetInitialVisibility() OVERRIDE; |
33 virtual views::View* CreateDefaultView(user::LoginStatus status) OVERRIDE; | 33 virtual views::View* CreateDefaultView(user::LoginStatus status, |
| 34 int bubble_width) OVERRIDE; |
34 virtual views::View* CreateDetailedView(user::LoginStatus status) OVERRIDE; | 35 virtual views::View* CreateDetailedView(user::LoginStatus status) OVERRIDE; |
35 virtual void DestroyDetailedView() OVERRIDE; | 36 virtual void DestroyDetailedView() OVERRIDE; |
36 | 37 |
37 // Overridden from UpdateObserver. | 38 // Overridden from UpdateObserver. |
38 virtual void OnUpdateRecommended(UpdateSeverity severity) OVERRIDE; | 39 virtual void OnUpdateRecommended(UpdateSeverity severity) OVERRIDE; |
39 | 40 |
40 // Used to nag the user in case the tray has been hidden too long with an | 41 // Used to nag the user in case the tray has been hidden too long with an |
41 // unseen update notification. | 42 // unseen update notification. |
42 scoped_ptr<tray::UpdateNagger> nagger_; | 43 scoped_ptr<tray::UpdateNagger> nagger_; |
43 | 44 |
44 UpdateObserver::UpdateSeverity severity_; | 45 UpdateObserver::UpdateSeverity severity_; |
45 | 46 |
46 DISALLOW_COPY_AND_ASSIGN(TrayUpdate); | 47 DISALLOW_COPY_AND_ASSIGN(TrayUpdate); |
47 }; | 48 }; |
48 | 49 |
49 } // namespace internal | 50 } // namespace internal |
50 } // namespace ash | 51 } // namespace ash |
51 | 52 |
52 #endif // ASH_SYSTEM_TRAY_UPDATE_H_ | 53 #endif // ASH_SYSTEM_TRAY_UPDATE_H_ |
OLD | NEW |