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

Side by Side Diff: ash/system/tray_accessibility.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_ACCESSIBILITY_H_ 5 #ifndef ASH_SYSTEM_TRAY_ACCESSIBILITY_H_
6 #define ASH_SYSTEM_TRAY_ACCESSIBILITY_H_ 6 #define ASH_SYSTEM_TRAY_ACCESSIBILITY_H_
7 7
8 #include "ash/system/tray/tray_image_item.h" 8 #include "ash/system/tray/tray_image_item.h"
9 9
10 namespace views { 10 namespace views {
11 class ImageView; 11 class ImageView;
12 class View; 12 class View;
13 } 13 }
14 14
15 namespace ash { 15 namespace ash {
16 16
17 class SystemTray;
18
17 class ASH_EXPORT AccessibilityObserver { 19 class ASH_EXPORT AccessibilityObserver {
18 public: 20 public:
19 virtual ~AccessibilityObserver() {} 21 virtual ~AccessibilityObserver() {}
20 22
21 // Notifies when accessibilty mode changes. 23 // Notifies when accessibilty mode changes.
22 virtual void OnAccessibilityModeChanged(bool enabled) = 0; 24 virtual void OnAccessibilityModeChanged(bool enabled) = 0;
23 }; 25 };
24 26
25 namespace internal { 27 namespace internal {
26 28
27 class TrayAccessibility : public TrayImageItem, 29 class TrayAccessibility : public TrayImageItem,
28 public AccessibilityObserver { 30 public AccessibilityObserver {
29 public: 31 public:
30 TrayAccessibility(); 32 explicit TrayAccessibility(SystemTray* system_tray);
31 virtual ~TrayAccessibility(); 33 virtual ~TrayAccessibility();
32 34
33 private: 35 private:
34 // Overridden from TrayImageItem. 36 // Overridden from TrayImageItem.
35 virtual bool GetInitialVisibility() OVERRIDE; 37 virtual bool GetInitialVisibility() OVERRIDE;
36 virtual views::View* CreateDefaultView(user::LoginStatus status) OVERRIDE; 38 virtual views::View* CreateDefaultView(user::LoginStatus status) OVERRIDE;
37 virtual views::View* CreateDetailedView(user::LoginStatus status) OVERRIDE; 39 virtual views::View* CreateDetailedView(user::LoginStatus status) OVERRIDE;
38 virtual void DestroyDefaultView() OVERRIDE; 40 virtual void DestroyDefaultView() OVERRIDE;
39 virtual void DestroyDetailedView() OVERRIDE; 41 virtual void DestroyDetailedView() OVERRIDE;
40 42
41 // Overridden from AccessibilityObserver. 43 // Overridden from AccessibilityObserver.
42 virtual void OnAccessibilityModeChanged(bool enabled) OVERRIDE; 44 virtual void OnAccessibilityModeChanged(bool enabled) OVERRIDE;
43 45
44 views::View* default_; 46 views::View* default_;
45 views::View* detailed_; 47 views::View* detailed_;
46 48
47 DISALLOW_COPY_AND_ASSIGN(TrayAccessibility); 49 DISALLOW_COPY_AND_ASSIGN(TrayAccessibility);
48 }; 50 };
49 51
50 } // namespace internal 52 } // namespace internal
51 } // namespace ash 53 } // namespace ash
52 54
53 #endif // ASH_SYSTEM_TRAY_ACCESSIBILITY_H_ 55 #endif // ASH_SYSTEM_TRAY_ACCESSIBILITY_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698