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

Side by Side Diff: chrome/browser/chromeos/accessibility/accessibility_util.cc

Issue 11194011: Reverting this CL because it was committed before I gave the final LGTM. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 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 | Annotate | Revision Log
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 #include "chrome/browser/chromeos/accessibility/accessibility_util.h" 5 #include "chrome/browser/chromeos/accessibility/accessibility_util.h"
6 6
7 #include <queue> 7 #include <queue>
8 8
9 #include "ash/high_contrast/high_contrast_controller.h" 9 #include "ash/high_contrast/high_contrast_controller.h"
10 #include "ash/magnifier/magnification_controller.h" 10 #include "ash/magnifier/magnification_controller.h"
11 #include "ash/shell.h" 11 #include "ash/shell.h"
12 #include "base/bind.h" 12 #include "base/bind.h"
13 #include "base/bind_helpers.h" 13 #include "base/bind_helpers.h"
14 #include "base/logging.h" 14 #include "base/logging.h"
15 #include "chrome/browser/accessibility/accessibility_extension_api.h" 15 #include "chrome/browser/accessibility/accessibility_extension_api.h"
16 #include "chrome/browser/browser_process.h" 16 #include "chrome/browser/browser_process.h"
17 #include "chrome/browser/chromeos/accessibility/magnification_manager.h"
18 #include "chrome/browser/extensions/component_loader.h" 17 #include "chrome/browser/extensions/component_loader.h"
19 #include "chrome/browser/extensions/extension_service.h" 18 #include "chrome/browser/extensions/extension_service.h"
20 #include "chrome/browser/extensions/file_reader.h" 19 #include "chrome/browser/extensions/file_reader.h"
21 #include "chrome/browser/prefs/pref_service.h" 20 #include "chrome/browser/prefs/pref_service.h"
22 #include "chrome/browser/profiles/profile.h" 21 #include "chrome/browser/profiles/profile.h"
23 #include "chrome/browser/profiles/profile_manager.h" 22 #include "chrome/browser/profiles/profile_manager.h"
24 #include "chrome/browser/speech/extension_api/tts_extension_api_controller.h" 23 #include "chrome/browser/speech/extension_api/tts_extension_api_controller.h"
25 #include "chrome/common/extensions/extension.h" 24 #include "chrome/common/extensions/extension.h"
26 #include "chrome/common/extensions/extension_messages.h" 25 #include "chrome/common/extensions/extension_messages.h"
27 #include "chrome/common/extensions/extension_resource.h" 26 #include "chrome/common/extensions/extension_resource.h"
(...skipping 142 matching lines...) Expand 10 before | Expand all | Expand 10 after
170 PrefService* pref_service = g_browser_process->local_state(); 169 PrefService* pref_service = g_browser_process->local_state();
171 pref_service->SetBoolean(prefs::kHighContrastEnabled, enabled); 170 pref_service->SetBoolean(prefs::kHighContrastEnabled, enabled);
172 pref_service->CommitPendingWrite(); 171 pref_service->CommitPendingWrite();
173 172
174 #if defined(USE_ASH) 173 #if defined(USE_ASH)
175 ash::Shell::GetInstance()->high_contrast_controller()->SetEnabled(enabled); 174 ash::Shell::GetInstance()->high_contrast_controller()->SetEnabled(enabled);
176 #endif 175 #endif
177 } 176 }
178 177
179 void EnableScreenMagnifier(bool enabled) { 178 void EnableScreenMagnifier(bool enabled) {
180 if (MagnificationManager::GetInstance()) 179 PrefService* pref_service = g_browser_process->local_state();
181 MagnificationManager::GetInstance()->SetEnabled(enabled); 180 pref_service->SetBoolean(prefs::kScreenMagnifierEnabled, enabled);
181 pref_service->CommitPendingWrite();
182
183 #if defined(USE_ASH)
184 ash::Shell::GetInstance()->magnification_controller()->SetEnabled(enabled);
185 #endif
182 } 186 }
183 187
184 void EnableVirtualKeyboard(bool enabled) { 188 void EnableVirtualKeyboard(bool enabled) {
185 PrefService* pref_service = g_browser_process->local_state(); 189 PrefService* pref_service = g_browser_process->local_state();
186 pref_service->SetBoolean(prefs::kVirtualKeyboardEnabled, enabled); 190 pref_service->SetBoolean(prefs::kVirtualKeyboardEnabled, enabled);
187 pref_service->CommitPendingWrite(); 191 pref_service->CommitPendingWrite();
188 } 192 }
189 193
190 void ToggleSpokenFeedback(content::WebUI* login_web_ui) { 194 void ToggleSpokenFeedback(content::WebUI* login_web_ui) {
191 bool spoken_feedback_enabled = g_browser_process && 195 bool spoken_feedback_enabled = g_browser_process &&
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
224 if (!g_browser_process) { 228 if (!g_browser_process) {
225 return false; 229 return false;
226 } 230 }
227 PrefService* prefs = g_browser_process->local_state(); 231 PrefService* prefs = g_browser_process->local_state();
228 bool high_contrast_enabled = prefs && 232 bool high_contrast_enabled = prefs &&
229 prefs->GetBoolean(prefs::kHighContrastEnabled); 233 prefs->GetBoolean(prefs::kHighContrastEnabled);
230 return high_contrast_enabled; 234 return high_contrast_enabled;
231 } 235 }
232 236
233 bool IsScreenMagnifierEnabled() { 237 bool IsScreenMagnifierEnabled() {
234 return MagnificationManager::GetInstance() && 238 if (!g_browser_process) {
235 MagnificationManager::GetInstance()->IsEnabled(); 239 return false;
240 }
241 PrefService* prefs = g_browser_process->local_state();
242 bool enabled = prefs && prefs->GetBoolean(prefs::kScreenMagnifierEnabled);
243 return enabled;
236 } 244 }
237 245
238 void MaybeSpeak(const std::string& utterance) { 246 void MaybeSpeak(const std::string& utterance) {
239 if (IsSpokenFeedbackEnabled()) 247 if (IsSpokenFeedbackEnabled())
240 Speak(utterance); 248 Speak(utterance);
241 } 249 }
242 250
243 } // namespace accessibility 251 } // namespace accessibility
244 } // namespace chromeos 252 } // namespace chromeos
OLDNEW
« no previous file with comments | « ash/magnifier/magnification_controller.cc ('k') | chrome/browser/chromeos/accessibility/magnification_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698