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

Unified Diff: mojo/shell/dynamic_application_loader.h

Issue 491443005: Get rid of KeepAlive. Quit shell when all urls run directly by Context are closed. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Bring back ConnectToServiceViaNetwork Created 6 years, 4 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
Index: mojo/shell/dynamic_application_loader.h
diff --git a/mojo/shell/dynamic_application_loader.h b/mojo/shell/dynamic_application_loader.h
index b365904c8184e004ac5234ee7494f805a77cdea9..95bc7bf570a4c6dc772ff598725dcff1dd5143a8 100644
--- a/mojo/shell/dynamic_application_loader.h
+++ b/mojo/shell/dynamic_application_loader.h
@@ -8,12 +8,12 @@
#include <map>
#include "base/macros.h"
+#include "base/memory/scoped_vector.h"
#include "base/memory/weak_ptr.h"
#include "mojo/application_manager/application_loader.h"
#include "mojo/public/cpp/system/core.h"
#include "mojo/services/public/interfaces/network/network_service.mojom.h"
#include "mojo/shell/dynamic_service_runner.h"
-#include "mojo/shell/keep_alive.h"
#include "url/gurl.h"
namespace mojo {
@@ -21,6 +21,7 @@ namespace shell {
class Context;
class DynamicServiceRunnerFactory;
+class DynamicServiceRunner;
// An implementation of ApplicationLoader that retrieves a dynamic library
// containing the implementation of the service and loads/runs it (via a
@@ -55,9 +56,12 @@ class DynamicApplicationLoader : public ApplicationLoader {
scoped_refptr<LoadCallbacks> callbacks,
bool delete_file_after,
bool response_path_exists);
+ void RunLibraryComplete(DynamicServiceRunner* runner,
tim (not reviewing) 2014/08/23 00:14:27 nit: OnRunLibraryComplete
DaveMoore 2014/08/24 22:31:11 Done.
+ const base::FilePath& temp_file);
Context* const context_;
scoped_ptr<DynamicServiceRunnerFactory> runner_factory_;
+ ScopedVector<DynamicServiceRunner> runners_;
NetworkServicePtr network_service_;
URLLoaderPtr url_loader_;
MimeTypeToURLMap mime_type_to_url_;

Powered by Google App Engine
This is Rietveld 408576698