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

Side by Side Diff: mojo/public/cpp/application/application_impl.h

Issue 845593003: Pass ServiceProvider and ServiceProvider& params in Connect (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: use nullptr instead of ServiceProviderPtr(), fix ShellImpl Created 5 years, 11 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/gpu/gl_context.cc ('k') | mojo/public/cpp/application/lib/application_impl.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_PUBLIC_APPLICATION_APPLICATION_IMPL_H_ 5 #ifndef MOJO_PUBLIC_APPLICATION_APPLICATION_IMPL_H_
6 #define MOJO_PUBLIC_APPLICATION_APPLICATION_IMPL_H_ 6 #define MOJO_PUBLIC_APPLICATION_APPLICATION_IMPL_H_
7 #include <vector> 7 #include <vector>
8 8
9 #include "mojo/public/cpp/application/application_connection.h" 9 #include "mojo/public/cpp/application/application_connection.h"
10 #include "mojo/public/cpp/application/lib/service_connector.h" 10 #include "mojo/public/cpp/application/lib/service_connector.h"
(...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after
91 91
92 void BindShell(ScopedMessagePipeHandle shell_handle); 92 void BindShell(ScopedMessagePipeHandle shell_handle);
93 void ClearConnections(); 93 void ClearConnections();
94 void OnShellError() { 94 void OnShellError() {
95 ClearConnections(); 95 ClearConnections();
96 Terminate(); 96 Terminate();
97 } 97 }
98 98
99 // Application implementation. 99 // Application implementation.
100 void AcceptConnection(const String& requestor_url, 100 void AcceptConnection(const String& requestor_url,
101 ServiceProviderPtr provider) override; 101 InterfaceRequest<ServiceProvider> services,
102 ServiceProviderPtr exposed_services) override;
102 103
103 typedef std::vector<internal::ServiceRegistry*> ServiceRegistryList; 104 typedef std::vector<internal::ServiceRegistry*> ServiceRegistryList;
104 105
105 bool initialized_; 106 bool initialized_;
106 ServiceRegistryList incoming_service_registries_; 107 ServiceRegistryList incoming_service_registries_;
107 ServiceRegistryList outgoing_service_registries_; 108 ServiceRegistryList outgoing_service_registries_;
108 ApplicationDelegate* delegate_; 109 ApplicationDelegate* delegate_;
109 ShellPtr shell_; 110 ShellPtr shell_;
110 ShellPtrWatcher* shell_watch_; 111 ShellPtrWatcher* shell_watch_;
111 std::vector<std::string> args_; 112 std::vector<std::string> args_;
112 113
113 MOJO_DISALLOW_COPY_AND_ASSIGN(ApplicationImpl); 114 MOJO_DISALLOW_COPY_AND_ASSIGN(ApplicationImpl);
114 }; 115 };
115 116
116 } // namespace mojo 117 } // namespace mojo
117 118
118 #endif // MOJO_PUBLIC_APPLICATION_APPLICATION_IMPL_H_ 119 #endif // MOJO_PUBLIC_APPLICATION_APPLICATION_IMPL_H_
OLDNEW
« no previous file with comments | « mojo/gpu/gl_context.cc ('k') | mojo/public/cpp/application/lib/application_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698