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

Side by Side Diff: content/browser/mojo/mojo_shell_context.cc

Issue 1878893002: Move //mojo/services tracing & catalog to //services (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@63move
Patch Set: . Created 4 years, 8 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 | « content/BUILD.gn ('k') | content/content.gyp » ('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 "content/browser/mojo/mojo_shell_context.h" 5 #include "content/browser/mojo/mojo_shell_context.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/command_line.h" 10 #include "base/command_line.h"
(...skipping 14 matching lines...) Expand all
25 #include "content/grit/content_resources.h" 25 #include "content/grit/content_resources.h"
26 #include "content/public/browser/browser_thread.h" 26 #include "content/public/browser/browser_thread.h"
27 #include "content/public/browser/content_browser_client.h" 27 #include "content/public/browser/content_browser_client.h"
28 #include "content/public/browser/utility_process_host.h" 28 #include "content/public/browser/utility_process_host.h"
29 #include "content/public/browser/utility_process_host_client.h" 29 #include "content/public/browser/utility_process_host_client.h"
30 #include "content/public/common/content_client.h" 30 #include "content/public/common/content_client.h"
31 #include "content/public/common/content_switches.h" 31 #include "content/public/common/content_switches.h"
32 #include "content/public/common/service_registry.h" 32 #include "content/public/common/service_registry.h"
33 #include "mojo/public/cpp/bindings/interface_request.h" 33 #include "mojo/public/cpp/bindings/interface_request.h"
34 #include "mojo/public/cpp/bindings/string.h" 34 #include "mojo/public/cpp/bindings/string.h"
35 #include "mojo/services/catalog/factory.h" 35 #include "services/catalog/factory.h"
36 #include "mojo/services/catalog/manifest_provider.h" 36 #include "services/catalog/manifest_provider.h"
37 #include "mojo/services/catalog/store.h" 37 #include "services/catalog/store.h"
38 #include "services/shell/connect_params.h" 38 #include "services/shell/connect_params.h"
39 #include "services/shell/loader.h" 39 #include "services/shell/loader.h"
40 #include "services/shell/native_runner.h" 40 #include "services/shell/native_runner.h"
41 #include "services/shell/public/cpp/identity.h" 41 #include "services/shell/public/cpp/identity.h"
42 #include "services/shell/public/cpp/shell_client.h" 42 #include "services/shell/public/cpp/shell_client.h"
43 #include "services/shell/public/interfaces/connector.mojom.h" 43 #include "services/shell/public/interfaces/connector.mojom.h"
44 #include "services/shell/runner/host/in_process_native_runner.h" 44 #include "services/shell/runner/host/in_process_native_runner.h"
45 45
46 namespace content { 46 namespace content {
47 47
(...skipping 298 matching lines...) Expand 10 before | Expand all | Expand 10 after
346 mojo::Identity source_id(requestor_name, user_id); 346 mojo::Identity source_id(requestor_name, user_id);
347 params->set_source(source_id); 347 params->set_source(source_id);
348 params->set_target(mojo::Identity(name, user_id)); 348 params->set_target(mojo::Identity(name, user_id));
349 params->set_remote_interfaces(std::move(request)); 349 params->set_remote_interfaces(std::move(request));
350 params->set_local_interfaces(std::move(exposed_services)); 350 params->set_local_interfaces(std::move(exposed_services));
351 params->set_connect_callback(callback); 351 params->set_connect_callback(callback);
352 shell_->Connect(std::move(params)); 352 shell_->Connect(std::move(params));
353 } 353 }
354 354
355 } // namespace content 355 } // namespace content
OLDNEW
« no previous file with comments | « content/BUILD.gn ('k') | content/content.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698