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

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

Issue 682943002: Make chrome/browser/chromeos/accessibility compile on Athena with use_ash=0 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@athena_do_not_use_ash41_scroll_end_effect
Patch Set: Created 6 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
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"
(...skipping 18 matching lines...) Expand all
29 namespace ash { 29 namespace ash {
30 class HoverHighlightView; 30 class HoverHighlightView;
31 class SystemTrayItem; 31 class SystemTrayItem;
32 32
33 class ASH_EXPORT AccessibilityObserver { 33 class ASH_EXPORT AccessibilityObserver {
34 public: 34 public:
35 virtual ~AccessibilityObserver() {} 35 virtual ~AccessibilityObserver() {}
36 36
37 // Notifies when accessibilty mode changes. 37 // Notifies when accessibilty mode changes.
38 virtual void OnAccessibilityModeChanged( 38 virtual void OnAccessibilityModeChanged(
39 AccessibilityNotificationVisibility notify) = 0; 39 ui::AccessibilityNotificationVisibility notify) = 0;
40 }; 40 };
41 41
42 42
43 namespace tray { 43 namespace tray {
44 44
45 class AccessibilityPopupView : public TrayNotificationView { 45 class AccessibilityPopupView : public TrayNotificationView {
46 public: 46 public:
47 AccessibilityPopupView(SystemTrayItem* owner, uint32 enabled_state_bits); 47 AccessibilityPopupView(SystemTrayItem* owner, uint32 enabled_state_bits);
48 48
49 const views::Label* label_for_test() const { return label_; } 49 const views::Label* label_for_test() const { return label_; }
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after
117 // Overridden from TrayImageItem. 117 // Overridden from TrayImageItem.
118 virtual bool GetInitialVisibility() override; 118 virtual bool GetInitialVisibility() override;
119 virtual views::View* CreateDefaultView(user::LoginStatus status) override; 119 virtual views::View* CreateDefaultView(user::LoginStatus status) override;
120 virtual views::View* CreateDetailedView(user::LoginStatus status) override; 120 virtual views::View* CreateDetailedView(user::LoginStatus status) override;
121 virtual void DestroyDefaultView() override; 121 virtual void DestroyDefaultView() override;
122 virtual void DestroyDetailedView() override; 122 virtual void DestroyDetailedView() override;
123 virtual void UpdateAfterLoginStatusChange(user::LoginStatus status) override; 123 virtual void UpdateAfterLoginStatusChange(user::LoginStatus status) override;
124 124
125 // Overridden from AccessibilityObserver. 125 // Overridden from AccessibilityObserver.
126 virtual void OnAccessibilityModeChanged( 126 virtual void OnAccessibilityModeChanged(
127 AccessibilityNotificationVisibility notify) override; 127 ui::AccessibilityNotificationVisibility notify) override;
128 128
129 views::View* default_; 129 views::View* default_;
130 tray::AccessibilityPopupView* detailed_popup_; 130 tray::AccessibilityPopupView* detailed_popup_;
131 tray::AccessibilityDetailedView* detailed_menu_; 131 tray::AccessibilityDetailedView* detailed_menu_;
132 132
133 // Bitmap of fvalues from AccessibilityState. Can contain any or 133 // Bitmap of fvalues from AccessibilityState. Can contain any or
134 // both of A11Y_SPOKEN_FEEDBACK A11Y_BRAILLE_DISPLAY_CONNECTED. 134 // both of A11Y_SPOKEN_FEEDBACK A11Y_BRAILLE_DISPLAY_CONNECTED.
135 uint32 request_popup_view_state_; 135 uint32 request_popup_view_state_;
136 136
137 bool tray_icon_visible_; 137 bool tray_icon_visible_;
138 user::LoginStatus login_; 138 user::LoginStatus login_;
139 139
140 // Bitmap of values from AccessibilityState enum. 140 // Bitmap of values from AccessibilityState enum.
141 uint32 previous_accessibility_state_; 141 uint32 previous_accessibility_state_;
142 142
143 // A11y feature status on just entering the lock screen. 143 // A11y feature status on just entering the lock screen.
144 bool show_a11y_menu_on_lock_screen_; 144 bool show_a11y_menu_on_lock_screen_;
145 145
146 friend class chromeos::TrayAccessibilityTest; 146 friend class chromeos::TrayAccessibilityTest;
147 DISALLOW_COPY_AND_ASSIGN(TrayAccessibility); 147 DISALLOW_COPY_AND_ASSIGN(TrayAccessibility);
148 }; 148 };
149 149
150 } // namespace ash 150 } // namespace ash
151 151
152 #endif // ASH_SYSTEM_TRAY_ACCESSIBILITY_H_ 152 #endif // ASH_SYSTEM_TRAY_ACCESSIBILITY_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698