Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(185)

Side by Side Diff: ash/system/tray_update.h

Issue 11415014: Stop using shell::GetInstance()->system_tray() in system tray items (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Modified CL to provide TrayItems and Tray*Views with parent pointers instead. Created 8 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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"
11 11
12 namespace views { 12 namespace views {
13 class View; 13 class View;
14 } 14 }
15 15
16 namespace ash { 16 namespace ash {
17 17
18 class SystemTray;
19
18 namespace internal { 20 namespace internal {
19 21
20 namespace tray { 22 namespace tray {
21 class UpdateNagger; 23 class UpdateNagger;
22 } 24 }
23 25
24 class TrayUpdate : public TrayImageItem, 26 class TrayUpdate : public TrayImageItem,
25 public UpdateObserver { 27 public UpdateObserver {
26 public: 28 public:
27 TrayUpdate(); 29 explicit TrayUpdate(SystemTray* system_tray);
28 virtual ~TrayUpdate(); 30 virtual ~TrayUpdate();
29 31
30 private: 32 private:
31 // Overridden from TrayImageItem. 33 // Overridden from TrayImageItem.
32 virtual bool GetInitialVisibility() OVERRIDE; 34 virtual bool GetInitialVisibility() OVERRIDE;
33 virtual views::View* CreateDefaultView(user::LoginStatus status) OVERRIDE; 35 virtual views::View* CreateDefaultView(user::LoginStatus status) OVERRIDE;
34 virtual views::View* CreateDetailedView(user::LoginStatus status) OVERRIDE; 36 virtual views::View* CreateDetailedView(user::LoginStatus status) OVERRIDE;
35 virtual void DestroyDetailedView() OVERRIDE; 37 virtual void DestroyDetailedView() OVERRIDE;
36 38
37 // Overridden from UpdateObserver. 39 // Overridden from UpdateObserver.
38 virtual void OnUpdateRecommended(UpdateSeverity severity) OVERRIDE; 40 virtual void OnUpdateRecommended(UpdateSeverity severity) OVERRIDE;
39 41
40 // Used to nag the user in case the tray has been hidden too long with an 42 // Used to nag the user in case the tray has been hidden too long with an
41 // unseen update notification. 43 // unseen update notification.
42 scoped_ptr<tray::UpdateNagger> nagger_; 44 scoped_ptr<tray::UpdateNagger> nagger_;
43 45
44 UpdateObserver::UpdateSeverity severity_; 46 UpdateObserver::UpdateSeverity severity_;
45 47
46 DISALLOW_COPY_AND_ASSIGN(TrayUpdate); 48 DISALLOW_COPY_AND_ASSIGN(TrayUpdate);
47 }; 49 };
48 50
49 } // namespace internal 51 } // namespace internal
50 } // namespace ash 52 } // namespace ash
51 53
52 #endif // ASH_SYSTEM_TRAY_UPDATE_H_ 54 #endif // ASH_SYSTEM_TRAY_UPDATE_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698