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

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: Removed unnecessary forward declarations. Renamed |tray| to |owner|. 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
18 namespace internal { 17 namespace internal {
19 18
20 namespace tray { 19 namespace tray {
21 class UpdateNagger; 20 class UpdateNagger;
22 } 21 }
23 22
24 class TrayUpdate : public TrayImageItem, 23 class TrayUpdate : public TrayImageItem,
25 public UpdateObserver { 24 public UpdateObserver {
26 public: 25 public:
27 TrayUpdate(); 26 explicit TrayUpdate(SystemTray* system_tray);
28 virtual ~TrayUpdate(); 27 virtual ~TrayUpdate();
29 28
30 private: 29 private:
31 // Overridden from TrayImageItem. 30 // Overridden from TrayImageItem.
32 virtual bool GetInitialVisibility() OVERRIDE; 31 virtual bool GetInitialVisibility() OVERRIDE;
33 virtual views::View* CreateDefaultView(user::LoginStatus status) OVERRIDE; 32 virtual views::View* CreateDefaultView(user::LoginStatus status) OVERRIDE;
34 virtual views::View* CreateDetailedView(user::LoginStatus status) OVERRIDE; 33 virtual views::View* CreateDetailedView(user::LoginStatus status) OVERRIDE;
35 virtual void DestroyDetailedView() OVERRIDE; 34 virtual void DestroyDetailedView() OVERRIDE;
36 35
37 // Overridden from UpdateObserver. 36 // Overridden from UpdateObserver.
38 virtual void OnUpdateRecommended(UpdateSeverity severity) OVERRIDE; 37 virtual void OnUpdateRecommended(UpdateSeverity severity) OVERRIDE;
39 38
40 // Used to nag the user in case the tray has been hidden too long with an 39 // Used to nag the user in case the tray has been hidden too long with an
41 // unseen update notification. 40 // unseen update notification.
42 scoped_ptr<tray::UpdateNagger> nagger_; 41 scoped_ptr<tray::UpdateNagger> nagger_;
43 42
44 UpdateObserver::UpdateSeverity severity_; 43 UpdateObserver::UpdateSeverity severity_;
45 44
46 DISALLOW_COPY_AND_ASSIGN(TrayUpdate); 45 DISALLOW_COPY_AND_ASSIGN(TrayUpdate);
47 }; 46 };
48 47
49 } // namespace internal 48 } // namespace internal
50 } // namespace ash 49 } // namespace ash
51 50
52 #endif // ASH_SYSTEM_TRAY_UPDATE_H_ 51 #endif // ASH_SYSTEM_TRAY_UPDATE_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698