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

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

Issue 1165013005: Changes html_viewer to get services from appropriate application (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: comment on OnTerminate Created 5 years, 6 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 | « components/html_viewer/setup.h ('k') | mojo/application/public/cpp/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_APPLICATION_PUBLIC_CPP_APPLICATION_IMPL_H_ 5 #ifndef MOJO_APPLICATION_PUBLIC_CPP_APPLICATION_IMPL_H_
6 #define MOJO_APPLICATION_PUBLIC_CPP_APPLICATION_IMPL_H_ 6 #define MOJO_APPLICATION_PUBLIC_CPP_APPLICATION_IMPL_H_
7 7
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/callback.h" 10 #include "base/callback.h"
11 #include "base/memory/weak_ptr.h"
11 #include "mojo/application/public/cpp/app_lifetime_helper.h" 12 #include "mojo/application/public/cpp/app_lifetime_helper.h"
12 #include "mojo/application/public/cpp/application_connection.h" 13 #include "mojo/application/public/cpp/application_connection.h"
13 #include "mojo/application/public/cpp/application_delegate.h" 14 #include "mojo/application/public/cpp/application_delegate.h"
14 #include "mojo/application/public/cpp/lib/service_registry.h" 15 #include "mojo/application/public/cpp/lib/service_registry.h"
15 #include "mojo/application/public/interfaces/application.mojom.h" 16 #include "mojo/application/public/interfaces/application.mojom.h"
16 #include "mojo/application/public/interfaces/shell.mojom.h" 17 #include "mojo/application/public/interfaces/shell.mojom.h"
17 #include "mojo/public/cpp/system/core.h" 18 #include "mojo/public/cpp/system/core.h"
18 19
19 namespace mojo { 20 namespace mojo {
20 21
(...skipping 105 matching lines...) Expand 10 before | Expand all | Expand 10 after
126 127
127 ServiceRegistryList incoming_service_registries_; 128 ServiceRegistryList incoming_service_registries_;
128 ServiceRegistryList outgoing_service_registries_; 129 ServiceRegistryList outgoing_service_registries_;
129 ApplicationDelegate* delegate_; 130 ApplicationDelegate* delegate_;
130 Binding<Application> binding_; 131 Binding<Application> binding_;
131 ShellPtr shell_; 132 ShellPtr shell_;
132 std::string url_; 133 std::string url_;
133 base::Closure termination_closure_; 134 base::Closure termination_closure_;
134 AppLifetimeHelper app_lifetime_helper_; 135 AppLifetimeHelper app_lifetime_helper_;
135 bool quit_requested_; 136 bool quit_requested_;
137 base::WeakPtrFactory<ApplicationImpl> weak_factory_;
136 138
137 MOJO_DISALLOW_COPY_AND_ASSIGN(ApplicationImpl); 139 MOJO_DISALLOW_COPY_AND_ASSIGN(ApplicationImpl);
138 }; 140 };
139 141
140 } // namespace mojo 142 } // namespace mojo
141 143
142 #endif // MOJO_APPLICATION_PUBLIC_CPP_APPLICATION_IMPL_H_ 144 #endif // MOJO_APPLICATION_PUBLIC_CPP_APPLICATION_IMPL_H_
OLDNEW
« no previous file with comments | « components/html_viewer/setup.h ('k') | mojo/application/public/cpp/lib/application_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698