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

Side by Side Diff: services/shell/public/cpp/shell_connection.h

Issue 1877753003: Move mojo\shell to services\shell (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@62scan
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 | « services/shell/public/cpp/shell_client.h ('k') | services/shell/public/cpp/shell_test.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 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_PUBLIC_CPP_SHELL_CONNECTION_H_ 5 #ifndef SERVICES_SHELL_PUBLIC_CPP_SHELL_CONNECTION_H_
6 #define MOJO_SHELL_PUBLIC_CPP_SHELL_CONNECTION_H_ 6 #define SERVICES_SHELL_PUBLIC_CPP_SHELL_CONNECTION_H_
7 7
8 #include <utility> 8 #include <utility>
9 #include <vector> 9 #include <vector>
10 10
11 #include "base/callback.h" 11 #include "base/callback.h"
12 #include "base/macros.h" 12 #include "base/macros.h"
13 #include "base/memory/scoped_vector.h" 13 #include "base/memory/scoped_vector.h"
14 #include "mojo/public/cpp/bindings/binding.h" 14 #include "mojo/public/cpp/bindings/binding.h"
15 #include "mojo/public/cpp/bindings/callback.h" 15 #include "mojo/public/cpp/bindings/callback.h"
16 #include "mojo/public/cpp/system/core.h" 16 #include "mojo/public/cpp/system/core.h"
17 #include "mojo/shell/public/cpp/shell_client.h" 17 #include "services/shell/public/cpp/shell_client.h"
18 #include "mojo/shell/public/interfaces/connector.mojom.h" 18 #include "services/shell/public/interfaces/connector.mojom.h"
19 #include "mojo/shell/public/interfaces/shell_client.mojom.h" 19 #include "services/shell/public/interfaces/shell_client.mojom.h"
20 20
21 namespace mojo { 21 namespace mojo {
22 22
23 class Connector; 23 class Connector;
24 24
25 // Encapsulates a connection to the Mojo Shell in two parts: 25 // Encapsulates a connection to the Mojo Shell in two parts:
26 // - a bound InterfacePtr to mojo::shell::mojom::Shell, the primary mechanism 26 // - a bound InterfacePtr to mojo::shell::mojom::Shell, the primary mechanism
27 // by which the instantiating application interacts with other services 27 // by which the instantiating application interacts with other services
28 // brokered by the Mojo Shell. 28 // brokered by the Mojo Shell.
29 // - a bound InterfaceRequest of mojo::shell::mojom::ShellClient, an interface 29 // - a bound InterfaceRequest of mojo::shell::mojom::ShellClient, an interface
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after
95 Binding<shell::mojom::ShellClient> binding_; 95 Binding<shell::mojom::ShellClient> binding_;
96 scoped_ptr<Connector> connector_; 96 scoped_ptr<Connector> connector_;
97 97
98 base::Closure connection_lost_closure_; 98 base::Closure connection_lost_closure_;
99 99
100 DISALLOW_COPY_AND_ASSIGN(ShellConnection); 100 DISALLOW_COPY_AND_ASSIGN(ShellConnection);
101 }; 101 };
102 102
103 } // namespace mojo 103 } // namespace mojo
104 104
105 #endif // MOJO_SHELL_PUBLIC_CPP_SHELL_CONNECTION_H_ 105 #endif // SERVICES_SHELL_PUBLIC_CPP_SHELL_CONNECTION_H_
OLDNEW
« no previous file with comments | « services/shell/public/cpp/shell_client.h ('k') | services/shell/public/cpp/shell_test.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698