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

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 onto dave's CL to move ServiceLoader ownership 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
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 "mojo/embedder/embedder.h" 8 #include "mojo/embedder/embedder.h"
9 #include "mojo/gles2/gles2_support_impl.h" 9 #include "mojo/gles2/gles2_support_impl.h"
10 #include "mojo/service_manager/service_loader.h" 10 #include "mojo/service_manager/service_loader.h"
11 #include "mojo/service_manager/service_manager.h" 11 #include "mojo/service_manager/service_manager.h"
12 #include "mojo/services/native_viewport/native_viewport_service.h" 12 #include "mojo/services/native_viewport/native_viewport_service.h"
13 #include "mojo/shell/dbus_service_loader.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
20 namespace mojo { 21 namespace mojo {
21 namespace shell { 22 namespace shell {
22 23
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
59 else 60 else
60 runner_factory.reset(new InProcessDynamicServiceRunnerFactory()); 61 runner_factory.reset(new InProcessDynamicServiceRunnerFactory());
61 62
62 service_manager_.set_default_loader( 63 service_manager_.set_default_loader(
63 scoped_ptr<ServiceLoader>( 64 scoped_ptr<ServiceLoader>(
64 new DynamicServiceLoader(this, runner_factory.Pass()))); 65 new DynamicServiceLoader(this, runner_factory.Pass())));
65 service_manager_.SetLoaderForURL( 66 service_manager_.SetLoaderForURL(
66 scoped_ptr<ServiceLoader>(new NativeViewportServiceLoader(this)), 67 scoped_ptr<ServiceLoader>(new NativeViewportServiceLoader(this)),
67 GURL("mojo:mojo_native_viewport_service")); 68 GURL("mojo:mojo_native_viewport_service"));
68 69
70 #if defined(OS_LINUX)
71 service_manager_.SetLoaderForScheme(
72 scoped_ptr<ServiceLoader>(new DBusServiceLoader(this)),
73 "dbus");
74 #endif // defined(OS_LINUX)
75
69 if (cmdline->HasSwitch(switches::kSpy)) { 76 if (cmdline->HasSwitch(switches::kSpy)) {
70 spy_.reset(new mojo::Spy(&service_manager_, 77 spy_.reset(new mojo::Spy(&service_manager_,
71 cmdline->GetSwitchValueASCII(switches::kSpy))); 78 cmdline->GetSwitchValueASCII(switches::kSpy)));
72 } 79 }
73 } 80 }
74 81
75 Context::~Context() { 82 Context::~Context() {
76 service_manager_.set_default_loader(scoped_ptr<ServiceLoader>()); 83 service_manager_.set_default_loader(scoped_ptr<ServiceLoader>());
77 } 84 }
78 85
79 } // namespace shell 86 } // namespace shell
80 } // namespace mojo 87 } // namespace mojo
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698