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

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

Issue 1761153002: Replace ChildController with ShellClientFactory (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@29binding
Patch Set: . Created 4 years, 9 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/mojo_shell.gyp ('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 #include <vector> 9 #include <vector>
10 10
(...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after
99 std::map<Identity, mojom::ShellClientFactoryPtr>; 99 std::map<Identity, mojom::ShellClientFactoryPtr>;
100 100
101 // ShellClient: 101 // ShellClient:
102 bool AcceptConnection(Connection* connection) override; 102 bool AcceptConnection(Connection* connection) override;
103 103
104 // InterfaceFactory<mojom::ApplicationManager>: 104 // InterfaceFactory<mojom::ApplicationManager>:
105 void Create(Connection* connection, 105 void Create(Connection* connection,
106 InterfaceRequest<mojom::ApplicationManager> request) override; 106 InterfaceRequest<mojom::ApplicationManager> request) override;
107 107
108 // mojom::ApplicationManager: 108 // mojom::ApplicationManager:
109 void CreateInstanceForHandle(ScopedHandle channel, 109 void CreateInstanceForFactory(
110 const String& name, 110 mojom::ShellClientFactoryPtr factory,
111 mojom::CapabilityFilterPtr filter, 111 const String& name,
112 mojom::PIDReceiverRequest pid_receiver) override; 112 mojom::CapabilityFilterPtr filter,
113 mojom::PIDReceiverRequest pid_receiver) override;
113 void AddInstanceListener(mojom::InstanceListenerPtr listener) override; 114 void AddInstanceListener(mojom::InstanceListenerPtr listener) override;
114 115
115 void InitPackageManager( 116 void InitPackageManager(
116 scoped_ptr<package_manager::ApplicationCatalogStore> app_catalog); 117 scoped_ptr<package_manager::ApplicationCatalogStore> app_catalog);
117 118
118 // Destroys all Shell-ends of connections established with Applications. 119 // Destroys all Shell-ends of connections established with Applications.
119 // Applications connected by this ApplicationManager will observe pipe errors 120 // Applications connected by this ApplicationManager will observe pipe errors
120 // and have a chance to shutdown. 121 // and have a chance to shutdown.
121 void TerminateShellConnections(); 122 void TerminateShellConnections();
122 123
(...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after
198 199
199 DISALLOW_COPY_AND_ASSIGN(ApplicationManager); 200 DISALLOW_COPY_AND_ASSIGN(ApplicationManager);
200 }; 201 };
201 202
202 mojom::Connector::ConnectCallback EmptyConnectCallback(); 203 mojom::Connector::ConnectCallback EmptyConnectCallback();
203 204
204 } // namespace shell 205 } // namespace shell
205 } // namespace mojo 206 } // namespace mojo
206 207
207 #endif // MOJO_SHELL_APPLICATION_MANAGER_H_ 208 #endif // MOJO_SHELL_APPLICATION_MANAGER_H_
OLDNEW
« no previous file with comments | « mojo/mojo_shell.gyp ('k') | mojo/shell/application_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698