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

Side by Side Diff: mojo/shell/dbus_application_loader_linux.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 unified diff | Download patch | Annotate | Revision Log
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_SHELL_DBUS_APPLICATION_LOADER_LINUX_H_ 5 #ifndef MOJO_SHELL_DBUS_APPLICATION_LOADER_LINUX_H_
6 #define MOJO_SHELL_DBUS_APPLICATION_LOADER_LINUX_H_ 6 #define MOJO_SHELL_DBUS_APPLICATION_LOADER_LINUX_H_
7 7
8 #include <map> 8 #include <map>
9 9
10 #include "base/macros.h" 10 #include "base/macros.h"
11 #include "base/memory/ref_counted.h" 11 #include "base/memory/ref_counted.h"
12 #include "mojo/application_manager/application_loader.h" 12 #include "mojo/application_manager/application_loader.h"
13 #include "mojo/public/cpp/system/core.h" 13 #include "mojo/public/cpp/system/core.h"
14 #include "mojo/shell/keep_alive.h"
15 #include "url/gurl.h" 14 #include "url/gurl.h"
16 15
17 namespace dbus { 16 namespace dbus {
18 class Bus; 17 class Bus;
19 } // namespace dbus 18 } // namespace dbus
20 19
21 namespace mojo { 20 namespace mojo {
22 namespace shell { 21 namespace shell {
23 22
24 class Context; 23 class Context;
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
80 typedef std::map<GURL, LoadContext*> LoadContextMap; 79 typedef std::map<GURL, LoadContext*> LoadContextMap;
81 LoadContextMap url_to_load_context_; 80 LoadContextMap url_to_load_context_;
82 81
83 DISALLOW_COPY_AND_ASSIGN(DBusApplicationLoader); 82 DISALLOW_COPY_AND_ASSIGN(DBusApplicationLoader);
84 }; 83 };
85 84
86 } // namespace shell 85 } // namespace shell
87 } // namespace mojo 86 } // namespace mojo
88 87
89 #endif // MOJO_SHELL_DBUS_APPLICATION_LOADER_LINUX_H_ 88 #endif // MOJO_SHELL_DBUS_APPLICATION_LOADER_LINUX_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698