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 "base/callback.h" | 7 #include "base/callback.h" |
8 #include "base/callback_helpers.h" | 8 #include "base/callback_helpers.h" |
9 #include "base/memory/scoped_ptr.h" | 9 #include "base/memory/scoped_ptr.h" |
10 #include "base/memory/singleton.h" | 10 #include "base/memory/singleton.h" |
(...skipping 30 matching lines...) Expand all Loading... | |
41 #include "components/user_manager/user_manager.h" | 41 #include "components/user_manager/user_manager.h" |
42 #include "content/public/browser/browser_accessibility_state.h" | 42 #include "content/public/browser/browser_accessibility_state.h" |
43 #include "content/public/browser/browser_thread.h" | 43 #include "content/public/browser/browser_thread.h" |
44 #include "content/public/browser/notification_details.h" | 44 #include "content/public/browser/notification_details.h" |
45 #include "content/public/browser/notification_service.h" | 45 #include "content/public/browser/notification_service.h" |
46 #include "content/public/browser/notification_source.h" | 46 #include "content/public/browser/notification_source.h" |
47 #include "content/public/browser/render_process_host.h" | 47 #include "content/public/browser/render_process_host.h" |
48 #include "content/public/browser/render_view_host.h" | 48 #include "content/public/browser/render_view_host.h" |
49 #include "content/public/browser/web_contents.h" | 49 #include "content/public/browser/web_contents.h" |
50 #include "content/public/browser/web_ui.h" | 50 #include "content/public/browser/web_ui.h" |
51 #include "extensions/browser/extension_registry.h" | |
51 #include "extensions/browser/extension_system.h" | 52 #include "extensions/browser/extension_system.h" |
52 #include "extensions/browser/file_reader.h" | 53 #include "extensions/browser/file_reader.h" |
53 #include "extensions/common/extension.h" | 54 #include "extensions/common/extension.h" |
54 #include "extensions/common/extension_messages.h" | 55 #include "extensions/common/extension_messages.h" |
55 #include "extensions/common/extension_resource.h" | 56 #include "extensions/common/extension_resource.h" |
56 #include "media/audio/sounds/sounds_manager.h" | 57 #include "media/audio/sounds/sounds_manager.h" |
57 #include "ui/base/resource/resource_bundle.h" | 58 #include "ui/base/resource/resource_bundle.h" |
58 #include "ui/keyboard/keyboard_controller.h" | 59 #include "ui/keyboard/keyboard_controller.h" |
59 #include "ui/keyboard/keyboard_util.h" | 60 #include "ui/keyboard/keyboard_util.h" |
60 | 61 |
(...skipping 130 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
191 int render_view_id, | 192 int render_view_id, |
192 const base::Closure& done_cb) { | 193 const base::Closure& done_cb) { |
193 // Make sure to always run |done_cb|. ChromeVox was loaded even if we end up | 194 // Make sure to always run |done_cb|. ChromeVox was loaded even if we end up |
194 // not injecting into this particular render view. | 195 // not injecting into this particular render view. |
195 base::ScopedClosureRunner done_runner(done_cb); | 196 base::ScopedClosureRunner done_runner(done_cb); |
196 RenderViewHost* render_view_host = | 197 RenderViewHost* render_view_host = |
197 RenderViewHost::FromID(render_process_id, render_view_id); | 198 RenderViewHost::FromID(render_process_id, render_view_id); |
198 if (!render_view_host) | 199 if (!render_view_host) |
199 return; | 200 return; |
200 const extensions::Extension* extension = | 201 const extensions::Extension* extension = |
201 extension_service->extensions()->GetByID( | 202 extensions::ExtensionRegistry::Get(extension_service->profile()) |
202 extension_misc::kChromeVoxExtensionId); | 203 ->GetExtensionById( |
not at google - send to devlin
2014/11/11 20:20:08
Slightly better would be
->enabled_extensions()->G
Reilly Grant (use Gerrit)
2014/11/11 20:55:30
Done.
| |
204 extension_misc::kChromeVoxExtensionId, | |
205 extensions::ExtensionRegistry::ENABLED); | |
203 | 206 |
204 // Set a flag to tell ChromeVox that it's just been enabled, | 207 // Set a flag to tell ChromeVox that it's just been enabled, |
205 // so that it won't interrupt our speech feedback enabled message. | 208 // so that it won't interrupt our speech feedback enabled message. |
206 ExtensionMsg_ExecuteCode_Params params; | 209 ExtensionMsg_ExecuteCode_Params params; |
207 params.request_id = 0; | 210 params.request_id = 0; |
208 params.extension_id = extension->id(); | 211 params.extension_id = extension->id(); |
209 params.is_javascript = true; | 212 params.is_javascript = true; |
210 params.code = "window.INJECTED_AFTER_LOAD = true;"; | 213 params.code = "window.INJECTED_AFTER_LOAD = true;"; |
211 params.run_at = extensions::UserScript::DOCUMENT_IDLE; | 214 params.run_at = extensions::UserScript::DOCUMENT_IDLE; |
212 params.all_frames = true; | 215 params.all_frames = true; |
(...skipping 936 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1149 // Do any teardown work needed immediately after ChromeVox actually unloads. | 1152 // Do any teardown work needed immediately after ChromeVox actually unloads. |
1150 if (system_sounds_enabled_) | 1153 if (system_sounds_enabled_) |
1151 ash::PlaySystemSoundAlways(SOUND_SPOKEN_FEEDBACK_DISABLED); | 1154 ash::PlaySystemSoundAlways(SOUND_SPOKEN_FEEDBACK_DISABLED); |
1152 #endif | 1155 #endif |
1153 // Clear the accessibility focus ring. | 1156 // Clear the accessibility focus ring. |
1154 AccessibilityFocusRingController::GetInstance()->SetFocusRing( | 1157 AccessibilityFocusRingController::GetInstance()->SetFocusRing( |
1155 std::vector<gfx::Rect>()); | 1158 std::vector<gfx::Rect>()); |
1156 } | 1159 } |
1157 | 1160 |
1158 } // namespace chromeos | 1161 } // namespace chromeos |
OLD | NEW |