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

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

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

Powered by Google App Engine
This is Rietveld 408576698