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

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

Issue 213233003: Show a notification when a braille display is connected. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@lkgr
Patch Set: Style and const correctness fixes. Created 6 years, 9 months 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
« no previous file with comments | « ash/default_accessibility_delegate.cc ('k') | ash/system/tray_accessibility.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/accessibility_delegate.h" 8 #include "ash/accessibility_delegate.h"
9 #include "ash/shell_observer.h" 9 #include "ash/shell_observer.h"
10 #include "ash/system/tray/tray_details_view.h" 10 #include "ash/system/tray/tray_details_view.h"
11 #include "ash/system/tray/tray_image_item.h" 11 #include "ash/system/tray/tray_image_item.h"
12 #include "ash/system/tray/tray_notification_view.h"
12 #include "ash/system/tray/view_click_listener.h" 13 #include "ash/system/tray/view_click_listener.h"
13 #include "base/gtest_prod_util.h" 14 #include "base/gtest_prod_util.h"
14 #include "ui/gfx/font.h" 15 #include "ui/gfx/font.h"
15 #include "ui/views/controls/button/button.h" 16 #include "ui/views/controls/button/button.h"
16 17
17 namespace chromeos { 18 namespace chromeos {
18 class TrayAccessibilityTest; 19 class TrayAccessibilityTest;
19 } 20 }
20 21
21 namespace views { 22 namespace views {
22 class Button; 23 class Button;
23 class ImageView; 24 class ImageView;
25 class Label;
24 class View; 26 class View;
25 } 27 }
26 28
27 namespace ash { 29 namespace ash {
28 30
29 class SystemTrayItem; 31 class SystemTrayItem;
30 32
31 class ASH_EXPORT AccessibilityObserver { 33 class ASH_EXPORT AccessibilityObserver {
32 public: 34 public:
33 virtual ~AccessibilityObserver() {} 35 virtual ~AccessibilityObserver() {}
34 36
35 // Notifies when accessibilty mode changes. 37 // Notifies when accessibilty mode changes.
36 virtual void OnAccessibilityModeChanged( 38 virtual void OnAccessibilityModeChanged(
37 AccessibilityNotificationVisibility notify) = 0; 39 AccessibilityNotificationVisibility notify) = 0;
38 }; 40 };
39 41
40 namespace internal { 42 namespace internal {
41 43
42 class HoverHighlightView; 44 class HoverHighlightView;
43 45
44 namespace tray { 46 namespace tray {
45 47
46 class AccessibilityPopupView; 48 class AccessibilityPopupView : public TrayNotificationView {
49 public:
50 AccessibilityPopupView(SystemTrayItem* owner, uint32 enabled_state_bits);
51
52 const views::Label* label_for_test() const { return label_; }
53
54 private:
55 views::Label* CreateLabel(uint32 enabled_state_bits);
56
57 views::Label* label_;
58
59 DISALLOW_COPY_AND_ASSIGN(AccessibilityPopupView);
60 };
47 61
48 class AccessibilityDetailedView : public TrayDetailsView, 62 class AccessibilityDetailedView : public TrayDetailsView,
49 public ViewClickListener, 63 public ViewClickListener,
50 public views::ButtonListener, 64 public views::ButtonListener,
51 public ShellObserver { 65 public ShellObserver {
52 public: 66 public:
53 explicit AccessibilityDetailedView(SystemTrayItem* owner, 67 explicit AccessibilityDetailedView(SystemTrayItem* owner,
54 user::LoginStatus login); 68 user::LoginStatus login);
55 virtual ~AccessibilityDetailedView() {} 69 virtual ~AccessibilityDetailedView() {}
56 70
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
112 virtual void UpdateAfterLoginStatusChange(user::LoginStatus status) OVERRIDE; 126 virtual void UpdateAfterLoginStatusChange(user::LoginStatus status) OVERRIDE;
113 127
114 // Overridden from AccessibilityObserver. 128 // Overridden from AccessibilityObserver.
115 virtual void OnAccessibilityModeChanged( 129 virtual void OnAccessibilityModeChanged(
116 AccessibilityNotificationVisibility notify) OVERRIDE; 130 AccessibilityNotificationVisibility notify) OVERRIDE;
117 131
118 views::View* default_; 132 views::View* default_;
119 tray::AccessibilityPopupView* detailed_popup_; 133 tray::AccessibilityPopupView* detailed_popup_;
120 tray::AccessibilityDetailedView* detailed_menu_; 134 tray::AccessibilityDetailedView* detailed_menu_;
121 135
122 bool request_popup_view_; 136 // Bitmap of fvalues from AccessibilityState. Can contain any or
137 // both of A11Y_SPOKEN_FEEDBACK A11Y_BRAILLE_DISPLAY_CONNECTED.
138 uint32 request_popup_view_state_;
139
123 bool tray_icon_visible_; 140 bool tray_icon_visible_;
124 user::LoginStatus login_; 141 user::LoginStatus login_;
125 142
126 // Bitmap of values from AccessibilityState enum. 143 // Bitmap of values from AccessibilityState enum.
127 uint32 previous_accessibility_state_; 144 uint32 previous_accessibility_state_;
128 145
129 // A11y feature status on just entering the lock screen. 146 // A11y feature status on just entering the lock screen.
130 bool show_a11y_menu_on_lock_screen_; 147 bool show_a11y_menu_on_lock_screen_;
131 148
132 friend class chromeos::TrayAccessibilityTest; 149 friend class chromeos::TrayAccessibilityTest;
133 DISALLOW_COPY_AND_ASSIGN(TrayAccessibility); 150 DISALLOW_COPY_AND_ASSIGN(TrayAccessibility);
134 }; 151 };
135 152
136 } // namespace internal 153 } // namespace internal
137 } // namespace ash 154 } // namespace ash
138 155
139 #endif // ASH_SYSTEM_TRAY_ACCESSIBILITY_H_ 156 #endif // ASH_SYSTEM_TRAY_ACCESSIBILITY_H_
OLDNEW
« no previous file with comments | « ash/default_accessibility_delegate.cc ('k') | ash/system/tray_accessibility.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698