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

Side by Side Diff: mojo/shell/application_manager.h

Issue 1410053006: Move third_party/mojo/src/mojo/public to mojo/public (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: merge Created 5 years, 1 month 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/application_loader.h ('k') | mojo/shell/application_manager.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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 #ifndef MOJO_SHELL_APPLICATION_MANAGER_H_ 5 #ifndef MOJO_SHELL_APPLICATION_MANAGER_H_
6 #define MOJO_SHELL_APPLICATION_MANAGER_H_ 6 #define MOJO_SHELL_APPLICATION_MANAGER_H_
7 7
8 #include <map> 8 #include <map>
9 9
10 #include "base/macros.h" 10 #include "base/macros.h"
11 #include "base/memory/scoped_ptr.h" 11 #include "base/memory/scoped_ptr.h"
12 #include "base/memory/scoped_vector.h" 12 #include "base/memory/scoped_vector.h"
13 #include "base/memory/weak_ptr.h" 13 #include "base/memory/weak_ptr.h"
14 #include "mojo/application/public/interfaces/application.mojom.h" 14 #include "mojo/application/public/interfaces/application.mojom.h"
15 #include "mojo/application/public/interfaces/service_provider.mojom.h" 15 #include "mojo/application/public/interfaces/service_provider.mojom.h"
16 #include "mojo/application/public/interfaces/shell.mojom.h" 16 #include "mojo/application/public/interfaces/shell.mojom.h"
17 #include "mojo/public/cpp/bindings/interface_ptr_info.h"
18 #include "mojo/public/cpp/bindings/interface_request.h"
17 #include "mojo/shell/application_loader.h" 19 #include "mojo/shell/application_loader.h"
18 #include "mojo/shell/capability_filter.h" 20 #include "mojo/shell/capability_filter.h"
19 #include "mojo/shell/connect_to_application_params.h" 21 #include "mojo/shell/connect_to_application_params.h"
20 #include "mojo/shell/fetcher.h" 22 #include "mojo/shell/fetcher.h"
21 #include "mojo/shell/identity.h" 23 #include "mojo/shell/identity.h"
22 #include "mojo/shell/native_runner.h" 24 #include "mojo/shell/native_runner.h"
23 #include "third_party/mojo/src/mojo/public/cpp/bindings/interface_ptr_info.h"
24 #include "third_party/mojo/src/mojo/public/cpp/bindings/interface_request.h"
25 #include "url/gurl.h" 25 #include "url/gurl.h"
26 26
27 namespace base { 27 namespace base {
28 class FilePath; 28 class FilePath;
29 class SequencedWorkerPool; 29 class SequencedWorkerPool;
30 } 30 }
31 31
32 namespace mojo { 32 namespace mojo {
33 namespace shell { 33 namespace shell {
34 34
(...skipping 102 matching lines...) Expand 10 before | Expand all | Expand 10 after
137 137
138 DISALLOW_COPY_AND_ASSIGN(ApplicationManager); 138 DISALLOW_COPY_AND_ASSIGN(ApplicationManager);
139 }; 139 };
140 140
141 Shell::ConnectToApplicationCallback EmptyConnectCallback(); 141 Shell::ConnectToApplicationCallback EmptyConnectCallback();
142 142
143 } // namespace shell 143 } // namespace shell
144 } // namespace mojo 144 } // namespace mojo
145 145
146 #endif // MOJO_SHELL_APPLICATION_MANAGER_H_ 146 #endif // MOJO_SHELL_APPLICATION_MANAGER_H_
OLDNEW
« no previous file with comments | « mojo/shell/application_loader.h ('k') | mojo/shell/application_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698