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

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

Issue 621133002: replace OVERRIDE and FINAL with override and final in ash/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 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_popup_label_button_border.h ('k') | ash/system/tray_update.h » ('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 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
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 virtual void OnViewClicked(views::View* sender) override;
80 // Overridden from ButtonListener. 80 // Overridden from ButtonListener.
81 virtual void ButtonPressed(views::Button* sender, 81 virtual void ButtonPressed(views::Button* sender,
82 const ui::Event& event) OVERRIDE; 82 const ui::Event& event) override;
83 83
84 views::View* spoken_feedback_view_; 84 views::View* spoken_feedback_view_;
85 views::View* high_contrast_view_; 85 views::View* high_contrast_view_;
86 views::View* screen_magnifier_view_; 86 views::View* screen_magnifier_view_;
87 views::View* large_cursor_view_; 87 views::View* large_cursor_view_;
88 views::View* help_view_; 88 views::View* help_view_;
89 views::View* settings_view_; 89 views::View* settings_view_;
90 views::View* autoclick_view_; 90 views::View* autoclick_view_;
91 views::View* virtual_keyboard_view_; 91 views::View* virtual_keyboard_view_;
92 92
(...skipping 15 matching lines...) Expand all
108 public AccessibilityObserver { 108 public AccessibilityObserver {
109 public: 109 public:
110 explicit TrayAccessibility(SystemTray* system_tray); 110 explicit TrayAccessibility(SystemTray* system_tray);
111 virtual ~TrayAccessibility(); 111 virtual ~TrayAccessibility();
112 112
113 private: 113 private:
114 void SetTrayIconVisible(bool visible); 114 void SetTrayIconVisible(bool visible);
115 tray::AccessibilityDetailedView* CreateDetailedMenu(); 115 tray::AccessibilityDetailedView* CreateDetailedMenu();
116 116
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 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
« no previous file with comments | « ash/system/tray/tray_popup_label_button_border.h ('k') | ash/system/tray_update.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698