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

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

Issue 2419723002: Move services/shell to services/service_manager (Closed)
Patch Set: rebase Created 4 years, 2 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
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 <stddef.h> 7 #include <stddef.h>
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include <memory> 10 #include <memory>
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
68 #include "content/public/common/service_manager_connection.h" 68 #include "content/public/common/service_manager_connection.h"
69 #include "extensions/browser/event_router.h" 69 #include "extensions/browser/event_router.h"
70 #include "extensions/browser/extension_registry.h" 70 #include "extensions/browser/extension_registry.h"
71 #include "extensions/browser/extension_system.h" 71 #include "extensions/browser/extension_system.h"
72 #include "extensions/common/extension.h" 72 #include "extensions/common/extension.h"
73 #include "extensions/common/extension_messages.h" 73 #include "extensions/common/extension_messages.h"
74 #include "extensions/common/extension_resource.h" 74 #include "extensions/common/extension_resource.h"
75 #include "extensions/common/host_id.h" 75 #include "extensions/common/host_id.h"
76 #include "mash/public/interfaces/launchable.mojom.h" 76 #include "mash/public/interfaces/launchable.mojom.h"
77 #include "media/audio/sounds/sounds_manager.h" 77 #include "media/audio/sounds/sounds_manager.h"
78 #include "services/shell/public/cpp/connector.h" 78 #include "services/service_manager/public/cpp/connector.h"
79 #include "ui/base/ime/chromeos/input_method_manager.h" 79 #include "ui/base/ime/chromeos/input_method_manager.h"
80 #include "ui/base/resource/resource_bundle.h" 80 #include "ui/base/resource/resource_bundle.h"
81 #include "ui/keyboard/keyboard_controller.h" 81 #include "ui/keyboard/keyboard_controller.h"
82 #include "ui/keyboard/keyboard_util.h" 82 #include "ui/keyboard/keyboard_util.h"
83 83
84 using content::BrowserThread; 84 using content::BrowserThread;
85 using content::RenderViewHost; 85 using content::RenderViewHost;
86 using extensions::api::braille_display_private::BrailleController; 86 using extensions::api::braille_display_private::BrailleController;
87 using extensions::api::braille_display_private::DisplayState; 87 using extensions::api::braille_display_private::DisplayState;
88 using extensions::api::braille_display_private::KeyEvent; 88 using extensions::api::braille_display_private::KeyEvent;
(...skipping 1254 matching lines...) Expand 10 before | Expand all | Expand 10 after
1343 content::BrowserContext* context) { 1343 content::BrowserContext* context) {
1344 keyboard_listener_extension_id_ = id; 1344 keyboard_listener_extension_id_ = id;
1345 1345
1346 extensions::ExtensionRegistry* registry = 1346 extensions::ExtensionRegistry* registry =
1347 extensions::ExtensionRegistry::Get(context); 1347 extensions::ExtensionRegistry::Get(context);
1348 if (!extension_registry_observer_.IsObserving(registry) && !id.empty()) 1348 if (!extension_registry_observer_.IsObserving(registry) && !id.empty())
1349 extension_registry_observer_.Add(registry); 1349 extension_registry_observer_.Add(registry);
1350 } 1350 }
1351 1351
1352 } // namespace chromeos 1352 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/BUILD.gn ('k') | chrome/browser/chromeos/arc/gpu_arc_video_service_host.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698