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

Side by Side Diff: trunk/src/mojo/shell/dbus_service_loader_linux.h

Issue 304593002: Revert 272983 "Change Shell / ShellClient to ServiceProvider" (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 6 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 | Annotate | Revision Log
« no previous file with comments | « trunk/src/mojo/shell/context.cc ('k') | trunk/src/mojo/shell/dbus_service_loader_linux.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_SHELL_DBUS_SERVICE_LOADER_H_ 5 #ifndef MOJO_SHELL_DBUS_SERVICE_LOADER_H_
6 #define MOJO_SHELL_DBUS_SERVICE_LOADER_H_ 6 #define MOJO_SHELL_DBUS_SERVICE_LOADER_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/public/cpp/system/core.h" 12 #include "mojo/public/cpp/system/core.h"
13 #include "mojo/public/interfaces/shell/shell.mojom.h"
13 #include "mojo/service_manager/service_loader.h" 14 #include "mojo/service_manager/service_loader.h"
14 #include "mojo/shell/keep_alive.h" 15 #include "mojo/shell/keep_alive.h"
15 #include "url/gurl.h" 16 #include "url/gurl.h"
16 17
17 namespace dbus { 18 namespace dbus {
18 class Bus; 19 class Bus;
19 } // namespace dbus 20 } // namespace dbus
20 21
21 namespace mojo { 22 namespace mojo {
22 namespace shell { 23 namespace shell {
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
80 typedef std::map<GURL, LoadContext*> LoadContextMap; 81 typedef std::map<GURL, LoadContext*> LoadContextMap;
81 LoadContextMap url_to_load_context_; 82 LoadContextMap url_to_load_context_;
82 83
83 DISALLOW_COPY_AND_ASSIGN(DBusServiceLoader); 84 DISALLOW_COPY_AND_ASSIGN(DBusServiceLoader);
84 }; 85 };
85 86
86 } // namespace shell 87 } // namespace shell
87 } // namespace mojo 88 } // namespace mojo
88 89
89 #endif // MOJO_SHELL_DBUS_SERVICE_LOADER_H_ 90 #endif // MOJO_SHELL_DBUS_SERVICE_LOADER_H_
OLDNEW
« no previous file with comments | « trunk/src/mojo/shell/context.cc ('k') | trunk/src/mojo/shell/dbus_service_loader_linux.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698