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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 750353004: Revert of Moves code from chromeos/ime to ui/base/ime/chromeos. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years 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
« no previous file with comments | « chrome/browser/chromeos/accessibility/accessibility_manager.h ('k') | chrome/browser/chromeos/accessibility/accessibility_manager_browsertest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 18 matching lines...) Expand all
29 #include "chrome/browser/extensions/extension_service.h" 29 #include "chrome/browser/extensions/extension_service.h"
30 #include "chrome/browser/profiles/profile.h" 30 #include "chrome/browser/profiles/profile.h"
31 #include "chrome/browser/profiles/profile_manager.h" 31 #include "chrome/browser/profiles/profile_manager.h"
32 #include "chrome/common/chrome_paths.h" 32 #include "chrome/common/chrome_paths.h"
33 #include "chrome/common/extensions/api/accessibility_private.h" 33 #include "chrome/common/extensions/api/accessibility_private.h"
34 #include "chrome/common/extensions/extension_constants.h" 34 #include "chrome/common/extensions/extension_constants.h"
35 #include "chrome/common/extensions/manifest_handlers/content_scripts_handler.h" 35 #include "chrome/common/extensions/manifest_handlers/content_scripts_handler.h"
36 #include "chrome/common/pref_names.h" 36 #include "chrome/common/pref_names.h"
37 #include "chrome/grit/browser_resources.h" 37 #include "chrome/grit/browser_resources.h"
38 #include "chromeos/audio/chromeos_sounds.h" 38 #include "chromeos/audio/chromeos_sounds.h"
39 #include "chromeos/ime/input_method_manager.h"
39 #include "chromeos/login/login_state.h" 40 #include "chromeos/login/login_state.h"
40 #include "components/user_manager/user_manager.h" 41 #include "components/user_manager/user_manager.h"
41 #include "content/public/browser/browser_accessibility_state.h" 42 #include "content/public/browser/browser_accessibility_state.h"
42 #include "content/public/browser/browser_thread.h" 43 #include "content/public/browser/browser_thread.h"
43 #include "content/public/browser/notification_details.h" 44 #include "content/public/browser/notification_details.h"
44 #include "content/public/browser/notification_service.h" 45 #include "content/public/browser/notification_service.h"
45 #include "content/public/browser/notification_source.h" 46 #include "content/public/browser/notification_source.h"
46 #include "content/public/browser/render_process_host.h" 47 #include "content/public/browser/render_process_host.h"
47 #include "content/public/browser/render_view_host.h" 48 #include "content/public/browser/render_view_host.h"
48 #include "content/public/browser/web_contents.h" 49 #include "content/public/browser/web_contents.h"
49 #include "content/public/browser/web_ui.h" 50 #include "content/public/browser/web_ui.h"
50 #include "extensions/browser/extension_registry.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/ime/chromeos/input_method_manager.h"
58 #include "ui/base/resource/resource_bundle.h" 58 #include "ui/base/resource/resource_bundle.h"
59 #include "ui/keyboard/keyboard_controller.h" 59 #include "ui/keyboard/keyboard_controller.h"
60 #include "ui/keyboard/keyboard_util.h" 60 #include "ui/keyboard/keyboard_util.h"
61 61
62 #if !defined(USE_ATHENA) 62 #if !defined(USE_ATHENA)
63 #include "ash/audio/sounds.h" 63 #include "ash/audio/sounds.h"
64 #include "ash/autoclick/autoclick_controller.h" 64 #include "ash/autoclick/autoclick_controller.h"
65 #include "ash/high_contrast/high_contrast_controller.h" 65 #include "ash/high_contrast/high_contrast_controller.h"
66 #include "ash/metrics/user_metrics_recorder.h" 66 #include "ash/metrics/user_metrics_recorder.h"
67 #include "ash/session/session_state_delegate.h" 67 #include "ash/session/session_state_delegate.h"
(...skipping 1085 matching lines...) Expand 10 before | Expand all | Expand 10 after
1153 // Do any teardown work needed immediately after ChromeVox actually unloads. 1153 // Do any teardown work needed immediately after ChromeVox actually unloads.
1154 if (system_sounds_enabled_) 1154 if (system_sounds_enabled_)
1155 ash::PlaySystemSoundAlways(SOUND_SPOKEN_FEEDBACK_DISABLED); 1155 ash::PlaySystemSoundAlways(SOUND_SPOKEN_FEEDBACK_DISABLED);
1156 #endif 1156 #endif
1157 // Clear the accessibility focus ring. 1157 // Clear the accessibility focus ring.
1158 AccessibilityFocusRingController::GetInstance()->SetFocusRing( 1158 AccessibilityFocusRingController::GetInstance()->SetFocusRing(
1159 std::vector<gfx::Rect>()); 1159 std::vector<gfx::Rect>());
1160 } 1160 }
1161 1161
1162 } // namespace chromeos 1162 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/accessibility/accessibility_manager.h ('k') | chrome/browser/chromeos/accessibility/accessibility_manager_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698