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

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

Issue 2041233005: Moves ash::user::LoginStatus to ash/common (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix test Created 4 years, 6 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/system/tray/tray_image_item.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 <stdint.h> 8 #include <stdint.h>
9 9
10 #include "ash/common/accessibility_delegate.h" 10 #include "ash/common/accessibility_delegate.h"
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
56 views::Label* label_; 56 views::Label* label_;
57 57
58 DISALLOW_COPY_AND_ASSIGN(AccessibilityPopupView); 58 DISALLOW_COPY_AND_ASSIGN(AccessibilityPopupView);
59 }; 59 };
60 60
61 class AccessibilityDetailedView : public TrayDetailsView, 61 class AccessibilityDetailedView : public TrayDetailsView,
62 public ViewClickListener, 62 public ViewClickListener,
63 public views::ButtonListener, 63 public views::ButtonListener,
64 public ShellObserver { 64 public ShellObserver {
65 public: 65 public:
66 explicit AccessibilityDetailedView(SystemTrayItem* owner, 66 AccessibilityDetailedView(SystemTrayItem* owner, LoginStatus login);
67 user::LoginStatus login);
68 ~AccessibilityDetailedView() override {} 67 ~AccessibilityDetailedView() override {}
69 68
70 private: 69 private:
71 // Add the accessibility feature list. 70 // Add the accessibility feature list.
72 void AppendAccessibilityList(); 71 void AppendAccessibilityList();
73 72
74 // Add help entries. 73 // Add help entries.
75 void AppendHelpEntries(); 74 void AppendHelpEntries();
76 75
77 HoverHighlightView* AddScrollListItem(const base::string16& text, 76 HoverHighlightView* AddScrollListItem(const base::string16& text,
(...skipping 12 matching lines...) Expand all
90 views::View* settings_view_; 89 views::View* settings_view_;
91 views::View* autoclick_view_; 90 views::View* autoclick_view_;
92 views::View* virtual_keyboard_view_; 91 views::View* virtual_keyboard_view_;
93 92
94 bool spoken_feedback_enabled_; 93 bool spoken_feedback_enabled_;
95 bool high_contrast_enabled_; 94 bool high_contrast_enabled_;
96 bool screen_magnifier_enabled_; 95 bool screen_magnifier_enabled_;
97 bool large_cursor_enabled_; 96 bool large_cursor_enabled_;
98 bool autoclick_enabled_; 97 bool autoclick_enabled_;
99 bool virtual_keyboard_enabled_; 98 bool virtual_keyboard_enabled_;
100 user::LoginStatus login_; 99 LoginStatus login_;
101 100
102 friend class chromeos::TrayAccessibilityTest; 101 friend class chromeos::TrayAccessibilityTest;
103 DISALLOW_COPY_AND_ASSIGN(AccessibilityDetailedView); 102 DISALLOW_COPY_AND_ASSIGN(AccessibilityDetailedView);
104 }; 103 };
105 104
106 } // namespace tray 105 } // namespace tray
107 106
108 class TrayAccessibility : public TrayImageItem, 107 class TrayAccessibility : public TrayImageItem,
109 public AccessibilityObserver { 108 public AccessibilityObserver {
110 public: 109 public:
111 explicit TrayAccessibility(SystemTray* system_tray); 110 explicit TrayAccessibility(SystemTray* system_tray);
112 ~TrayAccessibility() override; 111 ~TrayAccessibility() override;
113 112
114 private: 113 private:
115 void SetTrayIconVisible(bool visible); 114 void SetTrayIconVisible(bool visible);
116 tray::AccessibilityDetailedView* CreateDetailedMenu(); 115 tray::AccessibilityDetailedView* CreateDetailedMenu();
117 116
118 // Overridden from TrayImageItem. 117 // Overridden from TrayImageItem.
119 bool GetInitialVisibility() override; 118 bool GetInitialVisibility() override;
120 views::View* CreateDefaultView(user::LoginStatus status) override; 119 views::View* CreateDefaultView(LoginStatus status) override;
121 views::View* CreateDetailedView(user::LoginStatus status) override; 120 views::View* CreateDetailedView(LoginStatus status) override;
122 void DestroyDefaultView() override; 121 void DestroyDefaultView() override;
123 void DestroyDetailedView() override; 122 void DestroyDetailedView() override;
124 void UpdateAfterLoginStatusChange(user::LoginStatus status) override; 123 void UpdateAfterLoginStatusChange(LoginStatus status) override;
125 124
126 // Overridden from AccessibilityObserver. 125 // Overridden from AccessibilityObserver.
127 void OnAccessibilityModeChanged( 126 void OnAccessibilityModeChanged(
128 ui::AccessibilityNotificationVisibility notify) override; 127 ui::AccessibilityNotificationVisibility notify) override;
129 128
130 views::View* default_; 129 views::View* default_;
131 tray::AccessibilityPopupView* detailed_popup_; 130 tray::AccessibilityPopupView* detailed_popup_;
132 tray::AccessibilityDetailedView* detailed_menu_; 131 tray::AccessibilityDetailedView* detailed_menu_;
133 132
134 // Bitmap of fvalues from AccessibilityState. Can contain any or 133 // Bitmap of fvalues from AccessibilityState. Can contain any or
135 // both of A11Y_SPOKEN_FEEDBACK A11Y_BRAILLE_DISPLAY_CONNECTED. 134 // both of A11Y_SPOKEN_FEEDBACK A11Y_BRAILLE_DISPLAY_CONNECTED.
136 uint32_t request_popup_view_state_; 135 uint32_t request_popup_view_state_;
137 136
138 bool tray_icon_visible_; 137 bool tray_icon_visible_;
139 user::LoginStatus login_; 138 LoginStatus login_;
140 139
141 // Bitmap of values from AccessibilityState enum. 140 // Bitmap of values from AccessibilityState enum.
142 uint32_t previous_accessibility_state_; 141 uint32_t previous_accessibility_state_;
143 142
144 // A11y feature status on just entering the lock screen. 143 // A11y feature status on just entering the lock screen.
145 bool show_a11y_menu_on_lock_screen_; 144 bool show_a11y_menu_on_lock_screen_;
146 145
147 friend class chromeos::TrayAccessibilityTest; 146 friend class chromeos::TrayAccessibilityTest;
148 DISALLOW_COPY_AND_ASSIGN(TrayAccessibility); 147 DISALLOW_COPY_AND_ASSIGN(TrayAccessibility);
149 }; 148 };
150 149
151 } // namespace ash 150 } // namespace ash
152 151
153 #endif // ASH_SYSTEM_TRAY_ACCESSIBILITY_H_ 152 #endif // ASH_SYSTEM_TRAY_ACCESSIBILITY_H_
OLDNEW
« no previous file with comments | « ash/system/tray/tray_image_item.cc ('k') | ash/system/tray_accessibility.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698