OLD | NEW |
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 Loading... |
59 else | 60 else |
60 runner_factory.reset(new InProcessDynamicServiceRunnerFactory()); | 61 runner_factory.reset(new InProcessDynamicServiceRunnerFactory()); |
61 | 62 |
62 dynamic_service_loader_.reset( | 63 dynamic_service_loader_.reset( |
63 new DynamicServiceLoader(this, runner_factory.Pass())); | 64 new DynamicServiceLoader(this, runner_factory.Pass())); |
64 service_manager_.set_default_loader(dynamic_service_loader_.get()); | 65 service_manager_.set_default_loader(dynamic_service_loader_.get()); |
65 native_viewport_service_loader_.reset(new NativeViewportServiceLoader(this)); | 66 native_viewport_service_loader_.reset(new NativeViewportServiceLoader(this)); |
66 service_manager_.SetLoaderForURL(native_viewport_service_loader_.get(), | 67 service_manager_.SetLoaderForURL(native_viewport_service_loader_.get(), |
67 GURL("mojo:mojo_native_viewport_service")); | 68 GURL("mojo:mojo_native_viewport_service")); |
68 | 69 |
| 70 dbus_service_loader_.reset(new DBusServiceLoader(this)); |
| 71 service_manager_.SetLoaderForScheme(dbus_service_loader_.get(), "dbus"); |
| 72 |
69 if (cmdline->HasSwitch(switches::kSpy)) { | 73 if (cmdline->HasSwitch(switches::kSpy)) { |
70 spy_.reset(new mojo::Spy(&service_manager_, | 74 spy_.reset(new mojo::Spy(&service_manager_, |
71 cmdline->GetSwitchValueASCII(switches::kSpy))); | 75 cmdline->GetSwitchValueASCII(switches::kSpy))); |
72 } | 76 } |
73 } | 77 } |
74 | 78 |
75 Context::~Context() { | 79 Context::~Context() { |
76 service_manager_.set_default_loader(NULL); | 80 service_manager_.set_default_loader(NULL); |
77 } | 81 } |
78 | 82 |
79 } // namespace shell | 83 } // namespace shell |
80 } // namespace mojo | 84 } // namespace mojo |
OLD | NEW |