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

Side by Side Diff: mojo/shell/standalone/context.cc

Issue 1828733004: Load application manifests from resources (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
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 | « mojo/shell/shell.cc ('k') | mojo/shell/tests/loader_unittest.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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 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 "mojo/shell/standalone/context.h" 5 #include "mojo/shell/standalone/context.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include <utility> 10 #include <utility>
(...skipping 148 matching lines...) Expand 10 before | Expand all | Expand 10 after
159 new InProcessNativeRunnerFactory(blocking_pool_.get())); 159 new InProcessNativeRunnerFactory(blocking_pool_.get()));
160 } else { 160 } else {
161 NativeRunnerDelegate* native_runner_delegate = init_params ? 161 NativeRunnerDelegate* native_runner_delegate = init_params ?
162 init_params->native_runner_delegate : nullptr; 162 init_params->native_runner_delegate : nullptr;
163 runner_factory.reset(new OutOfProcessNativeRunnerFactory( 163 runner_factory.reset(new OutOfProcessNativeRunnerFactory(
164 blocking_pool_.get(), native_runner_delegate)); 164 blocking_pool_.get(), native_runner_delegate));
165 } 165 }
166 scoped_ptr<catalog::Store> store; 166 scoped_ptr<catalog::Store> store;
167 if (init_params) 167 if (init_params)
168 store = std::move(init_params->catalog_store); 168 store = std::move(init_params->catalog_store);
169 catalog_.reset(new catalog::Factory(blocking_pool_.get(), std::move(store))); 169 catalog_.reset(
170 new catalog::Factory(blocking_pool_.get(), std::move(store), nullptr));
170 shell_.reset(new Shell(std::move(runner_factory), 171 shell_.reset(new Shell(std::move(runner_factory),
171 catalog_->TakeShellClient())); 172 catalog_->TakeShellClient()));
172 173
173 shell::mojom::InterfaceProviderPtr tracing_remote_interfaces; 174 shell::mojom::InterfaceProviderPtr tracing_remote_interfaces;
174 shell::mojom::InterfaceProviderPtr tracing_local_interfaces; 175 shell::mojom::InterfaceProviderPtr tracing_local_interfaces;
175 new TracingInterfaceProvider(&tracer_, GetProxy(&tracing_local_interfaces)); 176 new TracingInterfaceProvider(&tracer_, GetProxy(&tracing_local_interfaces));
176 177
177 scoped_ptr<ConnectParams> params(new ConnectParams); 178 scoped_ptr<ConnectParams> params(new ConnectParams);
178 params->set_source(CreateShellIdentity()); 179 params->set_source(CreateShellIdentity());
179 params->set_target(Identity("mojo:tracing", mojom::kRootUserID)); 180 params->set_target(Identity("mojo:tracing", mojom::kRootUserID));
(...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after
255 scoped_ptr<ConnectParams> params(new ConnectParams); 256 scoped_ptr<ConnectParams> params(new ConnectParams);
256 params->set_source(CreateShellIdentity()); 257 params->set_source(CreateShellIdentity());
257 params->set_target(Identity(name, mojom::kRootUserID)); 258 params->set_target(Identity(name, mojom::kRootUserID));
258 params->set_remote_interfaces(GetProxy(&remote_interfaces)); 259 params->set_remote_interfaces(GetProxy(&remote_interfaces));
259 params->set_local_interfaces(std::move(local_interfaces)); 260 params->set_local_interfaces(std::move(local_interfaces));
260 shell_->Connect(std::move(params)); 261 shell_->Connect(std::move(params));
261 } 262 }
262 263
263 } // namespace shell 264 } // namespace shell
264 } // namespace mojo 265 } // namespace mojo
OLDNEW
« no previous file with comments | « mojo/shell/shell.cc ('k') | mojo/shell/tests/loader_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698