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

Side by Side Diff: ash/system/date/tray_date.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_DATE_TRAY_DATE_H_ 5 #ifndef ASH_SYSTEM_DATE_TRAY_DATE_H_
6 #define ASH_SYSTEM_DATE_TRAY_DATE_H_ 6 #define ASH_SYSTEM_DATE_TRAY_DATE_H_
7 7
8 #include "ash/system/date/clock_observer.h" 8 #include "ash/system/date/clock_observer.h"
9 #include "ash/system/tray/system_tray_item.h" 9 #include "ash/system/tray/system_tray_item.h"
10 10
(...skipping 14 matching lines...) Expand all
25 enum ClockLayout { 25 enum ClockLayout {
26 HORIZONTAL_CLOCK, 26 HORIZONTAL_CLOCK,
27 VERTICAL_CLOCK, 27 VERTICAL_CLOCK,
28 }; 28 };
29 TrayDate(); 29 TrayDate();
30 virtual ~TrayDate(); 30 virtual ~TrayDate();
31 31
32 private: 32 private:
33 // Overridden from SystemTrayItem. 33 // Overridden from SystemTrayItem.
34 virtual views::View* CreateTrayView(user::LoginStatus status) OVERRIDE; 34 virtual views::View* CreateTrayView(user::LoginStatus status) OVERRIDE;
35 virtual views::View* CreateDefaultView(user::LoginStatus status) OVERRIDE; 35 virtual views::View* CreateDefaultView(user::LoginStatus status,
36 int bubble_width) OVERRIDE;
36 virtual views::View* CreateDetailedView(user::LoginStatus status) OVERRIDE; 37 virtual views::View* CreateDetailedView(user::LoginStatus status) OVERRIDE;
37 virtual void DestroyTrayView() OVERRIDE; 38 virtual void DestroyTrayView() OVERRIDE;
38 virtual void DestroyDefaultView() OVERRIDE; 39 virtual void DestroyDefaultView() OVERRIDE;
39 virtual void DestroyDetailedView() OVERRIDE; 40 virtual void DestroyDetailedView() OVERRIDE;
40 virtual void UpdateAfterLoginStatusChange(user::LoginStatus status) OVERRIDE; 41 virtual void UpdateAfterLoginStatusChange(user::LoginStatus status) OVERRIDE;
41 virtual void UpdateAfterShelfAlignmentChange( 42 virtual void UpdateAfterShelfAlignmentChange(
42 ShelfAlignment alignment) OVERRIDE; 43 ShelfAlignment alignment) OVERRIDE;
43 44
44 // Overridden from ClockObserver. 45 // Overridden from ClockObserver.
45 virtual void OnDateFormatChanged() OVERRIDE; 46 virtual void OnDateFormatChanged() OVERRIDE;
46 virtual void Refresh() OVERRIDE; 47 virtual void Refresh() OVERRIDE;
47 48
48 void SetupLabelForTimeTray(views::Label* label); 49 void SetupLabelForTimeTray(views::Label* label);
49 50
50 tray::TimeView* time_tray_; 51 tray::TimeView* time_tray_;
51 52
52 DISALLOW_COPY_AND_ASSIGN(TrayDate); 53 DISALLOW_COPY_AND_ASSIGN(TrayDate);
53 }; 54 };
54 55
55 } // namespace internal 56 } // namespace internal
56 } // namespace ash 57 } // namespace ash
57 58
58 #endif // ASH_SYSTEM_DATE_TRAY_DATE_H_ 59 #endif // ASH_SYSTEM_DATE_TRAY_DATE_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698