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

Side by Side Diff: chrome/browser/ui/ash/chrome_shell_delegate_chromeos.cc

Issue 857433003: Update {virtual,override,final} to follow C++11 style chrome/browser/ui. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix rebase Created 5 years, 11 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
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 #include "chrome/browser/ui/ash/chrome_shell_delegate.h" 5 #include "chrome/browser/ui/ash/chrome_shell_delegate.h"
6 6
7 #include "ash/accelerators/magnifier_key_scroller.h" 7 #include "ash/accelerators/magnifier_key_scroller.h"
8 #include "ash/accelerators/spoken_feedback_toggler.h" 8 #include "ash/accelerators/spoken_feedback_toggler.h"
9 #include "ash/accessibility_delegate.h" 9 #include "ash/accessibility_delegate.h"
10 #include "ash/wm/mru_window_tracker.h" 10 #include "ash/wm/mru_window_tracker.h"
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
57 ash::MagnifierKeyScroller::SetEnabled(chrome::IsRunningInForcedAppMode()); 57 ash::MagnifierKeyScroller::SetEnabled(chrome::IsRunningInForcedAppMode());
58 58
59 // Enable long press action to toggle spoken feedback with hotrod 59 // Enable long press action to toggle spoken feedback with hotrod
60 // remote which can't handle shortcut. 60 // remote which can't handle shortcut.
61 ash::SpokenFeedbackToggler::SetEnabled(chrome::IsRunningInForcedAppMode()); 61 ash::SpokenFeedbackToggler::SetEnabled(chrome::IsRunningInForcedAppMode());
62 } 62 }
63 63
64 class AccessibilityDelegateImpl : public ash::AccessibilityDelegate { 64 class AccessibilityDelegateImpl : public ash::AccessibilityDelegate {
65 public: 65 public:
66 AccessibilityDelegateImpl() {} 66 AccessibilityDelegateImpl() {}
67 virtual ~AccessibilityDelegateImpl() {} 67 ~AccessibilityDelegateImpl() override {}
68 68
69 virtual void ToggleHighContrast() override { 69 void ToggleHighContrast() override {
70 DCHECK(chromeos::AccessibilityManager::Get()); 70 DCHECK(chromeos::AccessibilityManager::Get());
71 chromeos::AccessibilityManager::Get()->EnableHighContrast( 71 chromeos::AccessibilityManager::Get()->EnableHighContrast(
72 !chromeos::AccessibilityManager::Get()->IsHighContrastEnabled()); 72 !chromeos::AccessibilityManager::Get()->IsHighContrastEnabled());
73 } 73 }
74 74
75 virtual bool IsSpokenFeedbackEnabled() const override { 75 bool IsSpokenFeedbackEnabled() const override {
76 DCHECK(chromeos::AccessibilityManager::Get()); 76 DCHECK(chromeos::AccessibilityManager::Get());
77 return chromeos::AccessibilityManager::Get()->IsSpokenFeedbackEnabled(); 77 return chromeos::AccessibilityManager::Get()->IsSpokenFeedbackEnabled();
78 } 78 }
79 79
80 virtual void ToggleSpokenFeedback( 80 void ToggleSpokenFeedback(
81 ui::AccessibilityNotificationVisibility notify) override { 81 ui::AccessibilityNotificationVisibility notify) override {
82 DCHECK(chromeos::AccessibilityManager::Get()); 82 DCHECK(chromeos::AccessibilityManager::Get());
83 chromeos::AccessibilityManager::Get()->ToggleSpokenFeedback(notify); 83 chromeos::AccessibilityManager::Get()->ToggleSpokenFeedback(notify);
84 } 84 }
85 85
86 virtual bool IsHighContrastEnabled() const override { 86 bool IsHighContrastEnabled() const override {
87 DCHECK(chromeos::AccessibilityManager::Get()); 87 DCHECK(chromeos::AccessibilityManager::Get());
88 return chromeos::AccessibilityManager::Get()->IsHighContrastEnabled(); 88 return chromeos::AccessibilityManager::Get()->IsHighContrastEnabled();
89 } 89 }
90 90
91 virtual void SetMagnifierEnabled(bool enabled) override { 91 void SetMagnifierEnabled(bool enabled) override {
92 DCHECK(chromeos::MagnificationManager::Get()); 92 DCHECK(chromeos::MagnificationManager::Get());
93 return chromeos::MagnificationManager::Get()->SetMagnifierEnabled(enabled); 93 return chromeos::MagnificationManager::Get()->SetMagnifierEnabled(enabled);
94 } 94 }
95 95
96 virtual void SetMagnifierType(ui::MagnifierType type) override { 96 void SetMagnifierType(ui::MagnifierType type) override {
97 DCHECK(chromeos::MagnificationManager::Get()); 97 DCHECK(chromeos::MagnificationManager::Get());
98 return chromeos::MagnificationManager::Get()->SetMagnifierType(type); 98 return chromeos::MagnificationManager::Get()->SetMagnifierType(type);
99 } 99 }
100 100
101 virtual bool IsMagnifierEnabled() const override { 101 bool IsMagnifierEnabled() const override {
102 DCHECK(chromeos::MagnificationManager::Get()); 102 DCHECK(chromeos::MagnificationManager::Get());
103 return chromeos::MagnificationManager::Get()->IsMagnifierEnabled(); 103 return chromeos::MagnificationManager::Get()->IsMagnifierEnabled();
104 } 104 }
105 105
106 virtual ui::MagnifierType GetMagnifierType() const override { 106 ui::MagnifierType GetMagnifierType() const override {
107 DCHECK(chromeos::MagnificationManager::Get()); 107 DCHECK(chromeos::MagnificationManager::Get());
108 return chromeos::MagnificationManager::Get()->GetMagnifierType(); 108 return chromeos::MagnificationManager::Get()->GetMagnifierType();
109 } 109 }
110 110
111 virtual void SetLargeCursorEnabled(bool enabled) override { 111 void SetLargeCursorEnabled(bool enabled) override {
112 DCHECK(chromeos::AccessibilityManager::Get()); 112 DCHECK(chromeos::AccessibilityManager::Get());
113 return chromeos::AccessibilityManager::Get()->EnableLargeCursor(enabled); 113 return chromeos::AccessibilityManager::Get()->EnableLargeCursor(enabled);
114 } 114 }
115 115
116 virtual bool IsLargeCursorEnabled() const override { 116 bool IsLargeCursorEnabled() const override {
117 DCHECK(chromeos::AccessibilityManager::Get()); 117 DCHECK(chromeos::AccessibilityManager::Get());
118 return chromeos::AccessibilityManager::Get()->IsLargeCursorEnabled(); 118 return chromeos::AccessibilityManager::Get()->IsLargeCursorEnabled();
119 } 119 }
120 120
121 virtual void SetAutoclickEnabled(bool enabled) override { 121 void SetAutoclickEnabled(bool enabled) override {
122 DCHECK(chromeos::AccessibilityManager::Get()); 122 DCHECK(chromeos::AccessibilityManager::Get());
123 return chromeos::AccessibilityManager::Get()->EnableAutoclick(enabled); 123 return chromeos::AccessibilityManager::Get()->EnableAutoclick(enabled);
124 } 124 }
125 125
126 virtual bool IsAutoclickEnabled() const override { 126 bool IsAutoclickEnabled() const override {
127 DCHECK(chromeos::AccessibilityManager::Get()); 127 DCHECK(chromeos::AccessibilityManager::Get());
128 return chromeos::AccessibilityManager::Get()->IsAutoclickEnabled(); 128 return chromeos::AccessibilityManager::Get()->IsAutoclickEnabled();
129 } 129 }
130 130
131 virtual void SetVirtualKeyboardEnabled(bool enabled) override { 131 void SetVirtualKeyboardEnabled(bool enabled) override {
132 DCHECK(chromeos::AccessibilityManager::Get()); 132 DCHECK(chromeos::AccessibilityManager::Get());
133 return chromeos::AccessibilityManager::Get()-> 133 return chromeos::AccessibilityManager::Get()->
134 EnableVirtualKeyboard(enabled); 134 EnableVirtualKeyboard(enabled);
135 } 135 }
136 136
137 virtual bool IsVirtualKeyboardEnabled() const override { 137 bool IsVirtualKeyboardEnabled() const override {
138 DCHECK(chromeos::AccessibilityManager::Get()); 138 DCHECK(chromeos::AccessibilityManager::Get());
139 return chromeos::AccessibilityManager::Get()->IsVirtualKeyboardEnabled(); 139 return chromeos::AccessibilityManager::Get()->IsVirtualKeyboardEnabled();
140 } 140 }
141 141
142 virtual bool ShouldShowAccessibilityMenu() const override { 142 bool ShouldShowAccessibilityMenu() const override {
143 DCHECK(chromeos::AccessibilityManager::Get()); 143 DCHECK(chromeos::AccessibilityManager::Get());
144 return chromeos::AccessibilityManager::Get()-> 144 return chromeos::AccessibilityManager::Get()->
145 ShouldShowAccessibilityMenu(); 145 ShouldShowAccessibilityMenu();
146 } 146 }
147 147
148 virtual bool IsBrailleDisplayConnected() const override { 148 bool IsBrailleDisplayConnected() const override {
149 DCHECK(chromeos::AccessibilityManager::Get()); 149 DCHECK(chromeos::AccessibilityManager::Get());
150 return chromeos::AccessibilityManager::Get()->IsBrailleDisplayConnected(); 150 return chromeos::AccessibilityManager::Get()->IsBrailleDisplayConnected();
151 } 151 }
152 152
153 virtual void SilenceSpokenFeedback() const override { 153 void SilenceSpokenFeedback() const override {
154 TtsController::GetInstance()->Stop(); 154 TtsController::GetInstance()->Stop();
155 } 155 }
156 156
157 virtual void SaveScreenMagnifierScale(double scale) override { 157 void SaveScreenMagnifierScale(double scale) override {
158 if (chromeos::MagnificationManager::Get()) 158 if (chromeos::MagnificationManager::Get())
159 chromeos::MagnificationManager::Get()->SaveScreenMagnifierScale(scale); 159 chromeos::MagnificationManager::Get()->SaveScreenMagnifierScale(scale);
160 } 160 }
161 161
162 virtual double GetSavedScreenMagnifierScale() override { 162 double GetSavedScreenMagnifierScale() override {
163 if (chromeos::MagnificationManager::Get()) { 163 if (chromeos::MagnificationManager::Get()) {
164 return chromeos::MagnificationManager::Get()-> 164 return chromeos::MagnificationManager::Get()->
165 GetSavedScreenMagnifierScale(); 165 GetSavedScreenMagnifierScale();
166 } 166 }
167 return std::numeric_limits<double>::min(); 167 return std::numeric_limits<double>::min();
168 } 168 }
169 169
170 virtual void TriggerAccessibilityAlert( 170 void TriggerAccessibilityAlert(ui::AccessibilityAlert alert) override {
171 ui::AccessibilityAlert alert) override {
172 Profile* profile = ProfileManager::GetActiveUserProfile(); 171 Profile* profile = ProfileManager::GetActiveUserProfile();
173 if (profile) { 172 if (profile) {
174 switch (alert) { 173 switch (alert) {
175 case ui::A11Y_ALERT_WINDOW_NEEDED: { 174 case ui::A11Y_ALERT_WINDOW_NEEDED: {
176 AccessibilityAlertInfo event( 175 AccessibilityAlertInfo event(
177 profile, l10n_util::GetStringUTF8(IDS_A11Y_ALERT_WINDOW_NEEDED)); 176 profile, l10n_util::GetStringUTF8(IDS_A11Y_ALERT_WINDOW_NEEDED));
178 SendControlAccessibilityNotification( 177 SendControlAccessibilityNotification(
179 ui::AX_EVENT_ALERT, &event); 178 ui::AX_EVENT_ALERT, &event);
180 AutomationManagerAsh::GetInstance()->HandleAlert( 179 AutomationManagerAsh::GetInstance()->HandleAlert(
181 profile, l10n_util::GetStringUTF8(IDS_A11Y_ALERT_WINDOW_NEEDED)); 180 profile, l10n_util::GetStringUTF8(IDS_A11Y_ALERT_WINDOW_NEEDED));
182 break; 181 break;
183 } 182 }
184 case ui::A11Y_ALERT_WINDOW_OVERVIEW_MODE_ENTERED: { 183 case ui::A11Y_ALERT_WINDOW_OVERVIEW_MODE_ENTERED: {
185 AccessibilityAlertInfo event( 184 AccessibilityAlertInfo event(
186 profile, l10n_util::GetStringUTF8( 185 profile, l10n_util::GetStringUTF8(
187 IDS_A11Y_ALERT_WINDOW_OVERVIEW_MODE_ENTERED)); 186 IDS_A11Y_ALERT_WINDOW_OVERVIEW_MODE_ENTERED));
188 SendControlAccessibilityNotification( 187 SendControlAccessibilityNotification(
189 ui::AX_EVENT_ALERT, &event); 188 ui::AX_EVENT_ALERT, &event);
190 AutomationManagerAsh::GetInstance()->HandleAlert( 189 AutomationManagerAsh::GetInstance()->HandleAlert(
191 profile, l10n_util::GetStringUTF8( 190 profile, l10n_util::GetStringUTF8(
192 IDS_A11Y_ALERT_WINDOW_OVERVIEW_MODE_ENTERED)); 191 IDS_A11Y_ALERT_WINDOW_OVERVIEW_MODE_ENTERED));
193 break; 192 break;
194 } 193 }
195 case ui::A11Y_ALERT_NONE: 194 case ui::A11Y_ALERT_NONE:
196 break; 195 break;
197 } 196 }
198 } 197 }
199 } 198 }
200 199
201 virtual ui::AccessibilityAlert GetLastAccessibilityAlert() override { 200 ui::AccessibilityAlert GetLastAccessibilityAlert() override {
202 return ui::A11Y_ALERT_NONE; 201 return ui::A11Y_ALERT_NONE;
203 } 202 }
204 203
205 virtual void PlayEarcon(int sound_key) override { 204 void PlayEarcon(int sound_key) override {
206 DCHECK(chromeos::AccessibilityManager::Get()); 205 DCHECK(chromeos::AccessibilityManager::Get());
207 return chromeos::AccessibilityManager::Get()->PlayEarcon(sound_key); 206 return chromeos::AccessibilityManager::Get()->PlayEarcon(sound_key);
208 } 207 }
209 208
210 virtual base::TimeDelta PlayShutdownSound() const override { 209 base::TimeDelta PlayShutdownSound() const override {
211 return chromeos::AccessibilityManager::Get()->PlayShutdownSound(); 210 return chromeos::AccessibilityManager::Get()->PlayShutdownSound();
212 } 211 }
213 212
214 private: 213 private:
215 DISALLOW_COPY_AND_ASSIGN(AccessibilityDelegateImpl); 214 DISALLOW_COPY_AND_ASSIGN(AccessibilityDelegateImpl);
216 }; 215 };
217 216
218 } // anonymous namespace 217 } // anonymous namespace
219 218
220 bool ChromeShellDelegate::IsFirstRunAfterBoot() const { 219 bool ChromeShellDelegate::IsFirstRunAfterBoot() const {
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
283 } 282 }
284 283
285 void ChromeShellDelegate::PlatformInit() { 284 void ChromeShellDelegate::PlatformInit() {
286 registrar_.Add(this, 285 registrar_.Add(this,
287 chrome::NOTIFICATION_LOGIN_USER_PROFILE_PREPARED, 286 chrome::NOTIFICATION_LOGIN_USER_PROFILE_PREPARED,
288 content::NotificationService::AllSources()); 287 content::NotificationService::AllSources());
289 registrar_.Add(this, 288 registrar_.Add(this,
290 chrome::NOTIFICATION_SESSION_STARTED, 289 chrome::NOTIFICATION_SESSION_STARTED,
291 content::NotificationService::AllSources()); 290 content::NotificationService::AllSources());
292 } 291 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/ash/chrome_new_window_delegate_chromeos.h ('k') | chrome/browser/ui/ash/ime_controller_chromeos.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698