OLD | NEW |
---|---|
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 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/chromeos/accessibility/accessibility_manager.h" | 5 #include "chrome/browser/chromeos/accessibility/accessibility_manager.h" |
6 | 6 |
7 #include "ash/audio/sounds.h" | 7 #include "ash/audio/sounds.h" |
8 #include "ash/autoclick/autoclick_controller.h" | 8 #include "ash/autoclick/autoclick_controller.h" |
9 #include "ash/high_contrast/high_contrast_controller.h" | 9 #include "ash/high_contrast/high_contrast_controller.h" |
10 #include "ash/metrics/user_metrics_recorder.h" | 10 #include "ash/metrics/user_metrics_recorder.h" |
11 #include "ash/session/session_state_delegate.h" | 11 #include "ash/session/session_state_delegate.h" |
12 #include "ash/shell.h" | 12 #include "ash/shell.h" |
13 #include "ash/sticky_keys/sticky_keys_controller.h" | 13 #include "ash/sticky_keys/sticky_keys_controller.h" |
14 #include "ash/system/tray/system_tray_notifier.h" | 14 #include "ash/system/tray/system_tray_notifier.h" |
15 #include "base/callback.h" | 15 #include "base/callback.h" |
16 #include "base/callback_helpers.h" | 16 #include "base/callback_helpers.h" |
17 #include "base/command_line.h" | |
17 #include "base/memory/scoped_ptr.h" | 18 #include "base/memory/scoped_ptr.h" |
18 #include "base/memory/singleton.h" | 19 #include "base/memory/singleton.h" |
19 #include "base/metrics/histogram.h" | 20 #include "base/metrics/histogram.h" |
20 #include "base/path_service.h" | 21 #include "base/path_service.h" |
21 #include "base/prefs/pref_member.h" | 22 #include "base/prefs/pref_member.h" |
22 #include "base/prefs/pref_service.h" | 23 #include "base/prefs/pref_service.h" |
23 #include "base/strings/string_split.h" | 24 #include "base/strings/string_split.h" |
24 #include "base/strings/string_util.h" | 25 #include "base/strings/string_util.h" |
25 #include "base/time/time.h" | 26 #include "base/time/time.h" |
26 #include "base/values.h" | 27 #include "base/values.h" |
27 #include "chrome/browser/accessibility/accessibility_extension_api.h" | 28 #include "chrome/browser/accessibility/accessibility_extension_api.h" |
28 #include "chrome/browser/browser_process.h" | 29 #include "chrome/browser/browser_process.h" |
29 #include "chrome/browser/chrome_notification_types.h" | 30 #include "chrome/browser/chrome_notification_types.h" |
30 #include "chrome/browser/chromeos/accessibility/magnification_manager.h" | 31 #include "chrome/browser/chromeos/accessibility/magnification_manager.h" |
31 #include "chrome/browser/chromeos/login/lock/screen_locker.h" | 32 #include "chrome/browser/chromeos/login/lock/screen_locker.h" |
32 #include "chrome/browser/chromeos/login/ui/login_display_host.h" | 33 #include "chrome/browser/chromeos/login/ui/login_display_host.h" |
33 #include "chrome/browser/chromeos/login/ui/login_display_host_impl.h" | 34 #include "chrome/browser/chromeos/login/ui/login_display_host_impl.h" |
34 #include "chrome/browser/chromeos/login/ui/webui_login_view.h" | 35 #include "chrome/browser/chromeos/login/ui/webui_login_view.h" |
35 #include "chrome/browser/chromeos/profiles/profile_helper.h" | 36 #include "chrome/browser/chromeos/profiles/profile_helper.h" |
36 #include "chrome/browser/chromeos/ui/accessibility_focus_ring_controller.h" | 37 #include "chrome/browser/chromeos/ui/accessibility_focus_ring_controller.h" |
38 #include "chrome/browser/extensions/api/braille_display_private/stub_braille_con troller.h" | |
37 #include "chrome/browser/extensions/component_loader.h" | 39 #include "chrome/browser/extensions/component_loader.h" |
38 #include "chrome/browser/extensions/extension_service.h" | 40 #include "chrome/browser/extensions/extension_service.h" |
39 #include "chrome/browser/extensions/tab_helper.h" | 41 #include "chrome/browser/extensions/tab_helper.h" |
40 #include "chrome/browser/prefs/incognito_mode_prefs.h" | 42 #include "chrome/browser/prefs/incognito_mode_prefs.h" |
41 #include "chrome/browser/profiles/profile.h" | 43 #include "chrome/browser/profiles/profile.h" |
42 #include "chrome/browser/profiles/profile_manager.h" | 44 #include "chrome/browser/profiles/profile_manager.h" |
43 #include "chrome/common/chrome_paths.h" | 45 #include "chrome/common/chrome_paths.h" |
44 #include "chrome/common/extensions/api/accessibility_private.h" | 46 #include "chrome/common/extensions/api/accessibility_private.h" |
45 #include "chrome/common/extensions/extension_constants.h" | 47 #include "chrome/common/extensions/extension_constants.h" |
46 #include "chrome/common/extensions/manifest_handlers/content_scripts_handler.h" | 48 #include "chrome/common/extensions/manifest_handlers/content_scripts_handler.h" |
47 #include "chrome/common/pref_names.h" | 49 #include "chrome/common/pref_names.h" |
48 #include "chrome/grit/browser_resources.h" | 50 #include "chrome/grit/browser_resources.h" |
49 #include "chromeos/audio/chromeos_sounds.h" | 51 #include "chromeos/audio/chromeos_sounds.h" |
50 #include "chromeos/login/login_state.h" | 52 #include "chromeos/login/login_state.h" |
51 #include "components/user_manager/user_manager.h" | 53 #include "components/user_manager/user_manager.h" |
52 #include "content/public/browser/browser_accessibility_state.h" | 54 #include "content/public/browser/browser_accessibility_state.h" |
53 #include "content/public/browser/browser_thread.h" | 55 #include "content/public/browser/browser_thread.h" |
54 #include "content/public/browser/notification_details.h" | 56 #include "content/public/browser/notification_details.h" |
55 #include "content/public/browser/notification_service.h" | 57 #include "content/public/browser/notification_service.h" |
56 #include "content/public/browser/notification_source.h" | 58 #include "content/public/browser/notification_source.h" |
57 #include "content/public/browser/render_process_host.h" | 59 #include "content/public/browser/render_process_host.h" |
58 #include "content/public/browser/render_view_host.h" | 60 #include "content/public/browser/render_view_host.h" |
59 #include "content/public/browser/web_contents.h" | 61 #include "content/public/browser/web_contents.h" |
60 #include "content/public/browser/web_ui.h" | 62 #include "content/public/browser/web_ui.h" |
63 #include "content/public/common/content_switches.h" | |
61 #include "extensions/browser/event_router.h" | 64 #include "extensions/browser/event_router.h" |
62 #include "extensions/browser/extension_registry.h" | 65 #include "extensions/browser/extension_registry.h" |
63 #include "extensions/browser/extension_system.h" | 66 #include "extensions/browser/extension_system.h" |
64 #include "extensions/browser/file_reader.h" | 67 #include "extensions/browser/file_reader.h" |
65 #include "extensions/browser/script_executor.h" | 68 #include "extensions/browser/script_executor.h" |
66 #include "extensions/common/extension.h" | 69 #include "extensions/common/extension.h" |
67 #include "extensions/common/extension_messages.h" | 70 #include "extensions/common/extension_messages.h" |
68 #include "extensions/common/extension_resource.h" | 71 #include "extensions/common/extension_resource.h" |
69 #include "extensions/common/host_id.h" | 72 #include "extensions/common/host_id.h" |
70 #include "media/audio/sounds/sounds_manager.h" | 73 #include "media/audio/sounds/sounds_manager.h" |
71 #include "ui/base/ime/chromeos/input_method_manager.h" | 74 #include "ui/base/ime/chromeos/input_method_manager.h" |
72 #include "ui/base/resource/resource_bundle.h" | 75 #include "ui/base/resource/resource_bundle.h" |
73 #include "ui/keyboard/keyboard_controller.h" | 76 #include "ui/keyboard/keyboard_controller.h" |
74 #include "ui/keyboard/keyboard_util.h" | 77 #include "ui/keyboard/keyboard_util.h" |
75 | 78 |
76 using content::BrowserThread; | 79 using content::BrowserThread; |
77 using content::RenderViewHost; | 80 using content::RenderViewHost; |
78 using extensions::api::braille_display_private::BrailleController; | 81 using extensions::api::braille_display_private::BrailleController; |
79 using extensions::api::braille_display_private::DisplayState; | 82 using extensions::api::braille_display_private::DisplayState; |
80 using extensions::api::braille_display_private::KeyEvent; | 83 using extensions::api::braille_display_private::KeyEvent; |
84 using extensions::api::braille_display_private::StubBrailleController; | |
81 | 85 |
82 namespace chromeos { | 86 namespace chromeos { |
83 | 87 |
84 namespace { | 88 namespace { |
85 | 89 |
86 static chromeos::AccessibilityManager* g_accessibility_manager = NULL; | 90 static chromeos::AccessibilityManager* g_accessibility_manager = NULL; |
87 | 91 |
88 static BrailleController* g_braille_controller_for_test = NULL; | 92 static BrailleController* g_braille_controller_for_test = NULL; |
89 | 93 |
90 BrailleController* GetBrailleController() { | 94 BrailleController* GetBrailleController() { |
91 return g_braille_controller_for_test | 95 if (g_braille_controller_for_test) |
92 ? g_braille_controller_for_test | 96 return g_braille_controller_for_test; |
93 : BrailleController::GetInstance(); | 97 // Don't use the real braille controller for tests to avoid automatically |
98 // starting ChromeVox which confuses some tests. | |
99 base::CommandLine* command_line = base::CommandLine::ForCurrentProcess(); | |
100 if (command_line->HasSwitch(switches::kTestType)) | |
dmazzoni
2015/09/25 17:20:59
Does this only work when the test is run in a subp
| |
101 return StubBrailleController::GetInstance(); | |
102 return BrailleController::GetInstance(); | |
94 } | 103 } |
95 | 104 |
96 base::FilePath GetChromeVoxPath() { | 105 base::FilePath GetChromeVoxPath() { |
97 base::FilePath path; | 106 base::FilePath path; |
98 if (!PathService::Get(chrome::DIR_RESOURCES, &path)) | 107 if (!PathService::Get(chrome::DIR_RESOURCES, &path)) |
99 NOTREACHED(); | 108 NOTREACHED(); |
100 path = path.Append(extension_misc::kChromeVoxExtensionPath); | 109 path = path.Append(extension_misc::kChromeVoxExtensionPath); |
101 return path; | 110 return path; |
102 } | 111 } |
103 | 112 |
(...skipping 1022 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1126 | 1135 |
1127 void AccessibilityManager::PostUnloadChromeVox(Profile* profile) { | 1136 void AccessibilityManager::PostUnloadChromeVox(Profile* profile) { |
1128 // Do any teardown work needed immediately after ChromeVox actually unloads. | 1137 // Do any teardown work needed immediately after ChromeVox actually unloads. |
1129 ash::PlaySystemSoundAlways(SOUND_SPOKEN_FEEDBACK_DISABLED); | 1138 ash::PlaySystemSoundAlways(SOUND_SPOKEN_FEEDBACK_DISABLED); |
1130 // Clear the accessibility focus ring. | 1139 // Clear the accessibility focus ring. |
1131 AccessibilityFocusRingController::GetInstance()->SetFocusRing( | 1140 AccessibilityFocusRingController::GetInstance()->SetFocusRing( |
1132 std::vector<gfx::Rect>()); | 1141 std::vector<gfx::Rect>()); |
1133 } | 1142 } |
1134 | 1143 |
1135 } // namespace chromeos | 1144 } // namespace chromeos |
OLD | NEW |