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

Side by Side Diff: ash/system/user/tray_user.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: 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_USER_TRAY_USER_H_ 5 #ifndef ASH_SYSTEM_USER_TRAY_USER_H_
6 #define ASH_SYSTEM_USER_TRAY_USER_H_ 6 #define ASH_SYSTEM_USER_TRAY_USER_H_
7 7
8 #include "ash/system/tray/system_tray_item.h" 8 #include "ash/system/tray/system_tray_item.h"
9 #include "ash/system/user/user_observer.h" 9 #include "ash/system/user/user_observer.h"
10 10
(...skipping 12 matching lines...) Expand all
23 23
24 class TrayUser : public SystemTrayItem, 24 class TrayUser : public SystemTrayItem,
25 public UserObserver { 25 public UserObserver {
26 public: 26 public:
27 TrayUser(); 27 TrayUser();
28 virtual ~TrayUser(); 28 virtual ~TrayUser();
29 29
30 private: 30 private:
31 // Overridden from SystemTrayItem 31 // Overridden from SystemTrayItem
32 virtual views::View* CreateTrayView(user::LoginStatus status) OVERRIDE; 32 virtual views::View* CreateTrayView(user::LoginStatus status) 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 DestroyTrayView() OVERRIDE; 36 virtual void DestroyTrayView() OVERRIDE;
36 virtual void DestroyDefaultView() OVERRIDE; 37 virtual void DestroyDefaultView() OVERRIDE;
37 virtual void DestroyDetailedView() OVERRIDE; 38 virtual void DestroyDetailedView() OVERRIDE;
38 virtual void UpdateAfterLoginStatusChange(user::LoginStatus status) OVERRIDE; 39 virtual void UpdateAfterLoginStatusChange(user::LoginStatus status) OVERRIDE;
39 virtual void UpdateAfterShelfAlignmentChange( 40 virtual void UpdateAfterShelfAlignmentChange(
40 ShelfAlignment alignment) OVERRIDE; 41 ShelfAlignment alignment) OVERRIDE;
41 42
42 // Overridden from UserObserver. 43 // Overridden from UserObserver.
43 virtual void OnUserUpdate() OVERRIDE; 44 virtual void OnUserUpdate() OVERRIDE;
44 45
45 tray::UserView* user_; 46 tray::UserView* user_;
46 tray::RoundedImageView* avatar_; 47 tray::RoundedImageView* avatar_;
47 views::Label* label_; 48 views::Label* label_;
48 49
49 DISALLOW_COPY_AND_ASSIGN(TrayUser); 50 DISALLOW_COPY_AND_ASSIGN(TrayUser);
50 }; 51 };
51 52
52 } // namespace internal 53 } // namespace internal
53 } // namespace ash 54 } // namespace ash
54 55
55 #endif // ASH_SYSTEM_USER_TRAY_USER_H_ 56 #endif // ASH_SYSTEM_USER_TRAY_USER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698