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

Side by Side Diff: shell/context.cc

Issue 788243007: Moves BackgroundShellApplicationLoader to shell/android (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: merge 2 trunk 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 | « shell/android/mojo_main.cc ('k') | no next file » | 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 "shell/context.h" 5 #include "shell/context.h"
6 6
7 #include <vector> 7 #include <vector>
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 "base/files/file_path.h" 11 #include "base/files/file_path.h"
12 #include "base/lazy_instance.h" 12 #include "base/lazy_instance.h"
13 #include "base/macros.h" 13 #include "base/macros.h"
14 #include "base/memory/scoped_ptr.h" 14 #include "base/memory/scoped_ptr.h"
15 #include "base/memory/scoped_vector.h" 15 #include "base/memory/scoped_vector.h"
16 #include "base/strings/string_split.h" 16 #include "base/strings/string_split.h"
17 #include "build/build_config.h" 17 #include "build/build_config.h"
18 #include "mojo/application_manager/application_loader.h" 18 #include "mojo/application_manager/application_loader.h"
19 #include "mojo/application_manager/application_manager.h" 19 #include "mojo/application_manager/application_manager.h"
20 #include "mojo/application_manager/background_shell_application_loader.h"
21 #include "mojo/common/tracing_impl.h" 20 #include "mojo/common/tracing_impl.h"
22 #include "mojo/edk/embedder/embedder.h" 21 #include "mojo/edk/embedder/embedder.h"
23 #include "mojo/edk/embedder/simple_platform_support.h" 22 #include "mojo/edk/embedder/simple_platform_support.h"
24 #include "mojo/public/cpp/application/application_connection.h" 23 #include "mojo/public/cpp/application/application_connection.h"
25 #include "mojo/public/cpp/application/application_delegate.h" 24 #include "mojo/public/cpp/application/application_delegate.h"
26 #include "mojo/public/cpp/application/application_impl.h" 25 #include "mojo/public/cpp/application/application_impl.h"
27 #include "mojo/spy/spy.h" 26 #include "mojo/spy/spy.h"
28 #include "services/tracing/tracing.mojom.h" 27 #include "services/tracing/tracing.mojom.h"
29 #include "shell/dynamic_application_loader.h" 28 #include "shell/dynamic_application_loader.h"
30 #include "shell/external_application_listener.h" 29 #include "shell/external_application_listener.h"
(...skipping 187 matching lines...) Expand 10 before | Expand all | Expand 10 after
218 ScopedMessagePipeHandle Context::ConnectToServiceByName( 217 ScopedMessagePipeHandle Context::ConnectToServiceByName(
219 const GURL& application_url, 218 const GURL& application_url,
220 const std::string& service_name) { 219 const std::string& service_name) {
221 app_urls_.insert(application_url); 220 app_urls_.insert(application_url);
222 return application_manager_.ConnectToServiceByName(application_url, 221 return application_manager_.ConnectToServiceByName(application_url,
223 service_name).Pass(); 222 service_name).Pass();
224 } 223 }
225 224
226 } // namespace shell 225 } // namespace shell
227 } // namespace mojo 226 } // namespace mojo
OLDNEW
« no previous file with comments | « shell/android/mojo_main.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698