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

Side by Side Diff: extensions/browser/mojo/service_registration.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
« no previous file with comments | « extensions/browser/mojo/DEPS ('k') | extensions/renderer/api/display_source/wifi_display/DEPS » ('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 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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 "extensions/browser/mojo/service_registration.h" 5 #include "extensions/browser/mojo/service_registration.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/command_line.h" 10 #include "base/command_line.h"
11 #include "content/public/browser/render_frame_host.h" 11 #include "content/public/browser/render_frame_host.h"
12 #include "content/public/browser/render_process_host.h" 12 #include "content/public/browser/render_process_host.h"
13 #include "content/public/browser/site_instance.h" 13 #include "content/public/browser/site_instance.h"
14 #include "extensions/browser/extension_registry.h" 14 #include "extensions/browser/extension_registry.h"
15 #include "extensions/browser/extensions_browser_client.h" 15 #include "extensions/browser/extensions_browser_client.h"
16 #include "extensions/browser/mojo/keep_alive_impl.h" 16 #include "extensions/browser/mojo/keep_alive_impl.h"
17 #include "extensions/browser/process_map.h" 17 #include "extensions/browser/process_map.h"
18 #include "extensions/common/constants.h" 18 #include "extensions/common/constants.h"
19 #include "extensions/common/extension_api.h" 19 #include "extensions/common/extension_api.h"
20 #include "extensions/common/switches.h" 20 #include "extensions/common/switches.h"
21 #include "services/shell/public/cpp/interface_registry.h" 21 #include "services/service_manager/public/cpp/interface_registry.h"
22 22
23 #if defined(ENABLE_WIFI_DISPLAY) 23 #if defined(ENABLE_WIFI_DISPLAY)
24 #include "extensions/browser/api/display_source/wifi_display/wifi_display_media_ service_impl.h" 24 #include "extensions/browser/api/display_source/wifi_display/wifi_display_media_ service_impl.h"
25 #include "extensions/browser/api/display_source/wifi_display/wifi_display_sessio n_service_impl.h" 25 #include "extensions/browser/api/display_source/wifi_display/wifi_display_sessio n_service_impl.h"
26 #endif 26 #endif
27 27
28 namespace extensions { 28 namespace extensions {
29 namespace { 29 namespace {
30 30
31 #if defined(ENABLE_WIFI_DISPLAY) 31 #if defined(ENABLE_WIFI_DISPLAY)
(...skipping 28 matching lines...) Expand all
60 registry->AddInterface( 60 registry->AddInterface(
61 base::Bind(WiFiDisplaySessionServiceImpl::BindToRequest, 61 base::Bind(WiFiDisplaySessionServiceImpl::BindToRequest,
62 render_frame_host->GetProcess()->GetBrowserContext())); 62 render_frame_host->GetProcess()->GetBrowserContext()));
63 registry->AddInterface( 63 registry->AddInterface(
64 base::Bind(WiFiDisplayMediaServiceImpl::BindToRequest)); 64 base::Bind(WiFiDisplayMediaServiceImpl::BindToRequest));
65 } 65 }
66 #endif 66 #endif
67 } 67 }
68 68
69 } // namespace extensions 69 } // namespace extensions
OLDNEW
« no previous file with comments | « extensions/browser/mojo/DEPS ('k') | extensions/renderer/api/display_source/wifi_display/DEPS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698