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

Unified Diff: mojo/application/public/cpp/application_impl.h

Issue 1249643004: media: Quit MojoMediaApplication when no ServiceFactory service is bound. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase only Created 5 years, 5 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « media/mojo/services/service_factory_impl.cc ('k') | mojo/application/public/cpp/lib/application_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/application/public/cpp/application_impl.h
diff --git a/mojo/application/public/cpp/application_impl.h b/mojo/application/public/cpp/application_impl.h
index 445fb161add282e136b6317e957bf7daccae0994..9c040131f4a1a2c60eb26ccab85120f773a2ff35 100644
--- a/mojo/application/public/cpp/application_impl.h
+++ b/mojo/application/public/cpp/application_impl.h
@@ -7,7 +7,6 @@
#include <vector>
-#include "base/callback.h"
#include "base/memory/weak_ptr.h"
#include "mojo/application/public/cpp/app_lifetime_helper.h"
#include "mojo/application/public/cpp/application_connection.h"
@@ -15,6 +14,7 @@
#include "mojo/application/public/cpp/lib/service_registry.h"
#include "mojo/application/public/interfaces/application.mojom.h"
#include "mojo/application/public/interfaces/shell.mojom.h"
+#include "mojo/public/cpp/bindings/callback.h"
#include "mojo/public/cpp/system/core.h"
namespace mojo {
@@ -63,7 +63,7 @@ class ApplicationImpl : public Application {
// quitting the current MessageLoop.
ApplicationImpl(ApplicationDelegate* delegate,
InterfaceRequest<Application> request,
- const base::Closure& termination_closure);
+ const Closure& termination_closure);
~ApplicationImpl() override;
// The Mojo shell. This will return a valid pointer after Initialize() has
@@ -141,7 +141,7 @@ class ApplicationImpl : public Application {
Binding<Application> binding_;
ShellPtr shell_;
std::string url_;
- base::Closure termination_closure_;
+ Closure termination_closure_;
AppLifetimeHelper app_lifetime_helper_;
bool quit_requested_;
bool in_destructor_;
« no previous file with comments | « media/mojo/services/service_factory_impl.cc ('k') | mojo/application/public/cpp/lib/application_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698