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

Side by Side Diff: mojo/shell/connect_to_application_params.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/capability_filter_test.cc ('k') | mojo/shell/connect_util.h » ('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 #ifndef MOJO_SHELL_CONNECT_TO_APPLICATION_PARAMS_H_ 5 #ifndef MOJO_SHELL_CONNECT_TO_APPLICATION_PARAMS_H_
6 #define MOJO_SHELL_CONNECT_TO_APPLICATION_PARAMS_H_ 6 #define MOJO_SHELL_CONNECT_TO_APPLICATION_PARAMS_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/callback.h" 10 #include "base/callback.h"
11 #include "mojo/application/public/interfaces/service_provider.mojom.h" 11 #include "mojo/application/public/interfaces/service_provider.mojom.h"
12 #include "mojo/application/public/interfaces/shell.mojom.h" 12 #include "mojo/application/public/interfaces/shell.mojom.h"
13 #include "mojo/public/cpp/bindings/interface_request.h"
13 #include "mojo/services/network/public/interfaces/url_loader.mojom.h" 14 #include "mojo/services/network/public/interfaces/url_loader.mojom.h"
14 #include "mojo/shell/identity.h" 15 #include "mojo/shell/identity.h"
15 #include "third_party/mojo/src/mojo/public/cpp/bindings/interface_request.h"
16 #include "url/gurl.h" 16 #include "url/gurl.h"
17 17
18 namespace mojo { 18 namespace mojo {
19 namespace shell { 19 namespace shell {
20 20
21 class ApplicationInstance; 21 class ApplicationInstance;
22 22
23 // This class represents a request for the application manager to connect to an 23 // This class represents a request for the application manager to connect to an
24 // application. 24 // application.
25 class ConnectToApplicationParams { 25 class ConnectToApplicationParams {
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after
86 base::Closure on_application_end_; 86 base::Closure on_application_end_;
87 Shell::ConnectToApplicationCallback connect_callback_; 87 Shell::ConnectToApplicationCallback connect_callback_;
88 88
89 DISALLOW_COPY_AND_ASSIGN(ConnectToApplicationParams); 89 DISALLOW_COPY_AND_ASSIGN(ConnectToApplicationParams);
90 }; 90 };
91 91
92 } // namespace shell 92 } // namespace shell
93 } // namespace mojo 93 } // namespace mojo
94 94
95 #endif // MOJO_SHELL_CONNECT_TO_APPLICATION_PARAMS_H_ 95 #endif // MOJO_SHELL_CONNECT_TO_APPLICATION_PARAMS_H_
OLDNEW
« no previous file with comments | « mojo/shell/capability_filter_test.cc ('k') | mojo/shell/connect_util.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698