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

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

Issue 10915140: Add the partial screen magnifier to Chrome OS. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Rebase Created 8 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
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/magnifier/partial_magnification_controller.h"
11 #include "ash/shell.h" 12 #include "ash/shell.h"
12 #include "base/bind.h" 13 #include "base/bind.h"
13 #include "base/bind_helpers.h" 14 #include "base/bind_helpers.h"
14 #include "base/logging.h" 15 #include "base/logging.h"
15 #include "chrome/browser/accessibility/accessibility_extension_api.h" 16 #include "chrome/browser/accessibility/accessibility_extension_api.h"
16 #include "chrome/browser/browser_process.h" 17 #include "chrome/browser/browser_process.h"
17 #include "chrome/browser/extensions/component_loader.h" 18 #include "chrome/browser/extensions/component_loader.h"
18 #include "chrome/browser/extensions/extension_service.h" 19 #include "chrome/browser/extensions/extension_service.h"
19 #include "chrome/browser/extensions/file_reader.h" 20 #include "chrome/browser/extensions/file_reader.h"
20 #include "chrome/browser/prefs/pref_service.h" 21 #include "chrome/browser/prefs/pref_service.h"
21 #include "chrome/browser/profiles/profile.h" 22 #include "chrome/browser/profiles/profile.h"
22 #include "chrome/browser/profiles/profile_manager.h" 23 #include "chrome/browser/profiles/profile_manager.h"
23 #include "chrome/browser/speech/extension_api/tts_extension_api_controller.h" 24 #include "chrome/browser/speech/extension_api/tts_extension_api_controller.h"
24 #include "chrome/common/extensions/extension.h" 25 #include "chrome/common/extensions/extension.h"
25 #include "chrome/common/extensions/extension_messages.h" 26 #include "chrome/common/extensions/extension_messages.h"
26 #include "chrome/common/extensions/extension_resource.h" 27 #include "chrome/common/extensions/extension_resource.h"
27 #include "chrome/common/extensions/user_script.h" 28 #include "chrome/common/extensions/user_script.h"
28 #include "chrome/common/pref_names.h" 29 #include "chrome/common/pref_names.h"
29 #include "content/public/browser/render_process_host.h" 30 #include "content/public/browser/render_process_host.h"
30 #include "content/public/browser/render_view_host.h" 31 #include "content/public/browser/render_view_host.h"
31 #include "content/public/browser/web_contents.h" 32 #include "content/public/browser/web_contents.h"
32 #include "content/public/browser/web_ui.h" 33 #include "content/public/browser/web_ui.h"
33 #include "grit/browser_resources.h" 34 #include "grit/browser_resources.h"
34 #include "grit/generated_resources.h" 35 #include "grit/generated_resources.h"
35 #include "ui/base/l10n/l10n_util.h" 36 #include "ui/base/l10n/l10n_util.h"
36 #include "ui/base/resource/resource_bundle.h" 37 #include "ui/base/resource/resource_bundle.h"
37 38
38 using content::RenderViewHost; 39 using content::RenderViewHost;
39 40
41 namespace {
42 const char kScreenMagnifierOff[] = "";
43 const char kScreenMagnifierFull[] = "full";
44 const char kScreenMagnifierPartial[] = "partial";
45 }
46
47
40 namespace chromeos { 48 namespace chromeos {
41 namespace accessibility { 49 namespace accessibility {
42 50
43 // Helper class that directly loads an extension's content scripts into 51 // Helper class that directly loads an extension's content scripts into
44 // all of the frames corresponding to a given RenderViewHost. 52 // all of the frames corresponding to a given RenderViewHost.
45 class ContentScriptLoader { 53 class ContentScriptLoader {
46 public: 54 public:
47 // Initialize the ContentScriptLoader with the ID of the extension 55 // Initialize the ContentScriptLoader with the ID of the extension
48 // and the RenderViewHost where the scripts should be loaded. 56 // and the RenderViewHost where the scripts should be loaded.
49 ContentScriptLoader(const std::string& extension_id, 57 ContentScriptLoader(const std::string& extension_id,
(...skipping 128 matching lines...) Expand 10 before | Expand all | Expand 10 after
178 void EnableHighContrast(bool enabled) { 186 void EnableHighContrast(bool enabled) {
179 PrefService* pref_service = g_browser_process->local_state(); 187 PrefService* pref_service = g_browser_process->local_state();
180 pref_service->SetBoolean(prefs::kHighContrastEnabled, enabled); 188 pref_service->SetBoolean(prefs::kHighContrastEnabled, enabled);
181 pref_service->CommitPendingWrite(); 189 pref_service->CommitPendingWrite();
182 190
183 #if defined(USE_ASH) 191 #if defined(USE_ASH)
184 ash::Shell::GetInstance()->high_contrast_controller()->SetEnabled(enabled); 192 ash::Shell::GetInstance()->high_contrast_controller()->SetEnabled(enabled);
185 #endif 193 #endif
186 } 194 }
187 195
188 void EnableScreenMagnifier(bool enabled) { 196 void SetScreenMagnifier(ScreenMagnifierType type) {
189 PrefService* pref_service = g_browser_process->local_state(); 197 PrefService* pref_service = g_browser_process->local_state();
190 pref_service->SetBoolean(prefs::kScreenMagnifierEnabled, enabled); 198 pref_service->SetString(prefs::kScreenMagnifierType,
199 ScreenMagnifierNameFromType(type));
191 pref_service->CommitPendingWrite(); 200 pref_service->CommitPendingWrite();
192 201
193 #if defined(USE_ASH) 202 #if defined(USE_ASH)
194 ash::Shell::GetInstance()->magnification_controller()->SetEnabled(enabled); 203 ash::Shell::GetInstance()->magnification_controller()->SetEnabled(
204 type == MAGNIFIER_FULL);
205 ash::Shell::GetInstance()->partial_magnification_controller()->SetEnabled(
206 type == MAGNIFIER_PARTIAL);
195 #endif 207 #endif
196 } 208 }
197 209
198 void EnableVirtualKeyboard(bool enabled) { 210 void EnableVirtualKeyboard(bool enabled) {
199 PrefService* pref_service = g_browser_process->local_state(); 211 PrefService* pref_service = g_browser_process->local_state();
200 pref_service->SetBoolean(prefs::kVirtualKeyboardEnabled, enabled); 212 pref_service->SetBoolean(prefs::kVirtualKeyboardEnabled, enabled);
201 pref_service->CommitPendingWrite(); 213 pref_service->CommitPendingWrite();
202 } 214 }
203 215
204 void ToggleSpokenFeedback(content::WebUI* login_web_ui) { 216 void ToggleSpokenFeedback(content::WebUI* login_web_ui) {
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
237 bool IsHighContrastEnabled() { 249 bool IsHighContrastEnabled() {
238 if (!g_browser_process) { 250 if (!g_browser_process) {
239 return false; 251 return false;
240 } 252 }
241 PrefService* prefs = g_browser_process->local_state(); 253 PrefService* prefs = g_browser_process->local_state();
242 bool high_contrast_enabled = prefs && 254 bool high_contrast_enabled = prefs &&
243 prefs->GetBoolean(prefs::kHighContrastEnabled); 255 prefs->GetBoolean(prefs::kHighContrastEnabled);
244 return high_contrast_enabled; 256 return high_contrast_enabled;
245 } 257 }
246 258
247 bool IsScreenMagnifierEnabled() { 259 ScreenMagnifierType GetScreenMagnifierType() {
248 if (!g_browser_process) { 260 if (!g_browser_process)
249 return false; 261 return MAGNIFIER_OFF;
262
263 PrefService* prefs = g_browser_process->local_state();
264 std::string screen_magnifier_type;
265 if (!prefs)
266 return MAGNIFIER_OFF;
267
268 return ScreenMagnifierTypeFromName(
269 prefs->GetString(prefs::kScreenMagnifierType).c_str());
270 }
271
272 ScreenMagnifierType ScreenMagnifierTypeFromName(const char type_name[]) {
273 if (0 == strcmp(type_name, kScreenMagnifierFull))
274 return MAGNIFIER_FULL;
275 else if (0 == strcmp(type_name, kScreenMagnifierPartial))
276 return MAGNIFIER_PARTIAL;
277 else
278 return MAGNIFIER_OFF;
279 }
280
281 const char* ScreenMagnifierNameFromType(ScreenMagnifierType type) {
282 switch (type) {
283 case MAGNIFIER_OFF:
284 return kScreenMagnifierOff;
285 case MAGNIFIER_FULL:
286 return kScreenMagnifierFull;
287 case MAGNIFIER_PARTIAL:
288 return kScreenMagnifierPartial;
250 } 289 }
251 PrefService* prefs = g_browser_process->local_state(); 290 return kScreenMagnifierOff;
252 bool enabled = prefs && prefs->GetBoolean(prefs::kScreenMagnifierEnabled);
253 return enabled;
254 } 291 }
255 292
256 void MaybeSpeak(const std::string& utterance) { 293 void MaybeSpeak(const std::string& utterance) {
257 if (IsSpokenFeedbackEnabled()) 294 if (IsSpokenFeedbackEnabled())
258 Speak(utterance); 295 Speak(utterance);
259 } 296 }
260 297
261 } // namespace accessibility 298 } // namespace accessibility
262 } // namespace chromeos 299 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/accessibility/accessibility_util.h ('k') | chrome/browser/chromeos/login/wizard_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698