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

Unified Diff: mojo/shell/dbus_application_loader_linux.cc

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/dbus_application_loader_linux.cc
diff --git a/mojo/shell/dbus_application_loader_linux.cc b/mojo/shell/dbus_application_loader_linux.cc
index 5d992742e4e1737a102737427e7f890f2495c922..14d9fd20ffba969d757c0a732d59901ac70c6155 100644
--- a/mojo/shell/dbus_application_loader_linux.cc
+++ b/mojo/shell/dbus_application_loader_linux.cc
@@ -21,7 +21,6 @@
#include "mojo/embedder/platform_channel_pair.h"
#include "mojo/shell/context.h"
#include "mojo/shell/external_service.mojom.h"
-#include "mojo/shell/keep_alive.h"
namespace mojo {
namespace shell {
@@ -41,8 +40,7 @@ class DBusApplicationLoader::LoadContext {
bus_(bus),
service_dbus_proxy_(NULL),
url_(url),
- service_provider_handle_(service_provider_handle.Pass()),
- keep_alive_(loader->context_) {
+ service_provider_handle_(service_provider_handle.Pass()) {
base::PostTaskAndReplyWithResult(
loader_->context_->task_runners()->io_runner(),
FROM_HERE,
@@ -131,7 +129,6 @@ class DBusApplicationLoader::LoadContext {
dbus::ObjectProxy* service_dbus_proxy_; // Owned by bus_;
const GURL url_;
ScopedMessagePipeHandle service_provider_handle_;
- KeepAlive keep_alive_;
scoped_ptr<embedder::ChannelInit> channel_init_;
ExternalServicePtr external_service_;

Powered by Google App Engine
This is Rietveld 408576698