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

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

Issue 10407089: Revert 138212 - Implement High Contrast mode for Chrome OS. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 7 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"
10 #include "ash/shell.h"
11 #include "base/bind.h" 9 #include "base/bind.h"
12 #include "base/bind_helpers.h" 10 #include "base/bind_helpers.h"
13 #include "base/logging.h" 11 #include "base/logging.h"
14 #include "chrome/browser/accessibility/accessibility_extension_api.h" 12 #include "chrome/browser/accessibility/accessibility_extension_api.h"
15 #include "chrome/browser/browser_process.h" 13 #include "chrome/browser/browser_process.h"
16 #include "chrome/browser/extensions/component_loader.h" 14 #include "chrome/browser/extensions/component_loader.h"
17 #include "chrome/browser/extensions/extension_service.h" 15 #include "chrome/browser/extensions/extension_service.h"
18 #include "chrome/browser/extensions/file_reader.h" 16 #include "chrome/browser/extensions/file_reader.h"
19 #include "chrome/browser/prefs/pref_service.h" 17 #include "chrome/browser/prefs/pref_service.h"
20 #include "chrome/browser/profiles/profile.h" 18 #include "chrome/browser/profiles/profile.h"
(...skipping 138 matching lines...) Expand 10 before | Expand all | Expand 10 after
159 } else { // Unload ChromeVox 157 } else { // Unload ChromeVox
160 extension_service->component_loader()->Remove(path); 158 extension_service->component_loader()->Remove(path);
161 DLOG(INFO) << "ChromeVox was Unloaded."; 159 DLOG(INFO) << "ChromeVox was Unloaded.";
162 } 160 }
163 } 161 }
164 162
165 void EnableHighContrast(bool enabled) { 163 void EnableHighContrast(bool enabled) {
166 PrefService* pref_service = g_browser_process->local_state(); 164 PrefService* pref_service = g_browser_process->local_state();
167 pref_service->SetBoolean(prefs::kHighContrastEnabled, enabled); 165 pref_service->SetBoolean(prefs::kHighContrastEnabled, enabled);
168 pref_service->CommitPendingWrite(); 166 pref_service->CommitPendingWrite();
169
170 #if defined(USE_ASH)
171 ash::Shell::GetInstance()->high_contrast_controller()->SetEnabled(enabled);
172 #endif
173 } 167 }
174 168
175 void EnableScreenMagnifier(bool enabled) { 169 void EnableScreenMagnifier(bool enabled) {
176 PrefService* pref_service = g_browser_process->local_state(); 170 PrefService* pref_service = g_browser_process->local_state();
177 pref_service->SetBoolean(prefs::kScreenMagnifierEnabled, enabled); 171 pref_service->SetBoolean(prefs::kScreenMagnifierEnabled, enabled);
178 pref_service->CommitPendingWrite(); 172 pref_service->CommitPendingWrite();
179 } 173 }
180 174
181 void EnableVirtualKeyboard(bool enabled) { 175 void EnableVirtualKeyboard(bool enabled) {
182 PrefService* pref_service = g_browser_process->local_state(); 176 PrefService* pref_service = g_browser_process->local_state();
(...skipping 21 matching lines...) Expand all
204 bool IsSpokenFeedbackEnabled() { 198 bool IsSpokenFeedbackEnabled() {
205 if (!g_browser_process) { 199 if (!g_browser_process) {
206 return false; 200 return false;
207 } 201 }
208 PrefService* prefs = g_browser_process->local_state(); 202 PrefService* prefs = g_browser_process->local_state();
209 bool spoken_feedback_enabled = prefs && 203 bool spoken_feedback_enabled = prefs &&
210 prefs->GetBoolean(prefs::kSpokenFeedbackEnabled); 204 prefs->GetBoolean(prefs::kSpokenFeedbackEnabled);
211 return spoken_feedback_enabled; 205 return spoken_feedback_enabled;
212 } 206 }
213 207
214 bool IsHighContrastEnabled() {
215 if (!g_browser_process) {
216 return false;
217 }
218 PrefService* prefs = g_browser_process->local_state();
219 bool high_contrast_enabled = prefs &&
220 prefs->GetBoolean(prefs::kHighContrastEnabled);
221 return high_contrast_enabled;
222 }
223
224 void MaybeSpeak(const std::string& utterance) { 208 void MaybeSpeak(const std::string& utterance) {
225 if (IsSpokenFeedbackEnabled()) 209 if (IsSpokenFeedbackEnabled())
226 Speak(utterance); 210 Speak(utterance);
227 } 211 }
228 212
229 } // namespace accessibility 213 } // namespace accessibility
230 } // namespace chromeos 214 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/accessibility/accessibility_util.h ('k') | chrome/browser/resources/options2/browser_options.html » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698