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

Side by Side Diff: mojo/shell/context.cc

Issue 242763003: Implement a trivial Mojo EchoService that can be connected to over DBus (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase to switch MojoChannelInit to ChannelInit Created 6 years, 8 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 | « mojo/shell/DEPS ('k') | mojo/shell/dbus_service_loader_linux.h » ('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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 #include "mojo/shell/context.h" 5 #include "mojo/shell/context.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "build/build_config.h"
8 #include "mojo/embedder/embedder.h" 9 #include "mojo/embedder/embedder.h"
9 #include "mojo/gles2/gles2_support_impl.h" 10 #include "mojo/gles2/gles2_support_impl.h"
10 #include "mojo/service_manager/service_loader.h" 11 #include "mojo/service_manager/service_loader.h"
11 #include "mojo/service_manager/service_manager.h" 12 #include "mojo/service_manager/service_manager.h"
12 #include "mojo/services/native_viewport/native_viewport_service.h" 13 #include "mojo/services/native_viewport/native_viewport_service.h"
13 #include "mojo/shell/dynamic_service_loader.h" 14 #include "mojo/shell/dynamic_service_loader.h"
14 #include "mojo/shell/in_process_dynamic_service_runner.h" 15 #include "mojo/shell/in_process_dynamic_service_runner.h"
15 #include "mojo/shell/network_delegate.h" 16 #include "mojo/shell/network_delegate.h"
16 #include "mojo/shell/out_of_process_dynamic_service_runner.h" 17 #include "mojo/shell/out_of_process_dynamic_service_runner.h"
17 #include "mojo/shell/switches.h" 18 #include "mojo/shell/switches.h"
18 #include "mojo/spy/spy.h" 19 #include "mojo/spy/spy.h"
19 20
21 #if defined(OS_LINUX)
22 #include "mojo/shell/dbus_service_loader_linux.h"
23 #endif // defined(OS_LINUX)
24
20 namespace mojo { 25 namespace mojo {
21 namespace shell { 26 namespace shell {
22 27
23 class Context::NativeViewportServiceLoader : public ServiceLoader { 28 class Context::NativeViewportServiceLoader : public ServiceLoader {
24 public: 29 public:
25 explicit NativeViewportServiceLoader(Context* context) : context_(context) {} 30 explicit NativeViewportServiceLoader(Context* context) : context_(context) {}
26 virtual ~NativeViewportServiceLoader() {} 31 virtual ~NativeViewportServiceLoader() {}
27 32
28 private: 33 private:
29 virtual void LoadService(ServiceManager* manager, 34 virtual void LoadService(ServiceManager* manager,
(...skipping 29 matching lines...) Expand all
59 else 64 else
60 runner_factory.reset(new InProcessDynamicServiceRunnerFactory()); 65 runner_factory.reset(new InProcessDynamicServiceRunnerFactory());
61 66
62 service_manager_.set_default_loader( 67 service_manager_.set_default_loader(
63 scoped_ptr<ServiceLoader>( 68 scoped_ptr<ServiceLoader>(
64 new DynamicServiceLoader(this, runner_factory.Pass()))); 69 new DynamicServiceLoader(this, runner_factory.Pass())));
65 service_manager_.SetLoaderForURL( 70 service_manager_.SetLoaderForURL(
66 scoped_ptr<ServiceLoader>(new NativeViewportServiceLoader(this)), 71 scoped_ptr<ServiceLoader>(new NativeViewportServiceLoader(this)),
67 GURL("mojo:mojo_native_viewport_service")); 72 GURL("mojo:mojo_native_viewport_service"));
68 73
74 #if defined(OS_LINUX)
75 service_manager_.SetLoaderForScheme(
76 scoped_ptr<ServiceLoader>(new DBusServiceLoader(this)),
77 "dbus");
78 #endif // defined(OS_LINUX)
79
69 if (cmdline->HasSwitch(switches::kSpy)) { 80 if (cmdline->HasSwitch(switches::kSpy)) {
70 spy_.reset(new mojo::Spy(&service_manager_, 81 spy_.reset(new mojo::Spy(&service_manager_,
71 cmdline->GetSwitchValueASCII(switches::kSpy))); 82 cmdline->GetSwitchValueASCII(switches::kSpy)));
72 } 83 }
73 } 84 }
74 85
75 Context::~Context() { 86 Context::~Context() {
76 service_manager_.set_default_loader(scoped_ptr<ServiceLoader>()); 87 service_manager_.set_default_loader(scoped_ptr<ServiceLoader>());
77 } 88 }
78 89
79 } // namespace shell 90 } // namespace shell
80 } // namespace mojo 91 } // namespace mojo
OLDNEW
« no previous file with comments | « mojo/shell/DEPS ('k') | mojo/shell/dbus_service_loader_linux.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698