Chromium Code Reviews| Index: mojo/shell/context.cc |
| diff --git a/mojo/shell/context.cc b/mojo/shell/context.cc |
| index df86d14bfccdf3670fe5bbdfa2f717c5c7396db8..de8bd9fc07c76f95d9c73820242772012c4ef858 100644 |
| --- a/mojo/shell/context.cc |
| +++ b/mojo/shell/context.cc |
| @@ -17,6 +17,10 @@ |
| #include "mojo/shell/switches.h" |
| #include "mojo/spy/spy.h" |
| +#if defined(OS_LINUX) |
|
viettrungluu
2014/04/23 20:07:24
You should probably explicitly include build/build
Chris Masone
2014/04/23 22:31:00
Done.
|
| +#include "mojo/shell/dbus_service_loader_linux.h" |
| +#endif // defined(OS_LINUX) |
| + |
| namespace mojo { |
| namespace shell { |
| @@ -66,6 +70,12 @@ Context::Context() |
| scoped_ptr<ServiceLoader>(new NativeViewportServiceLoader(this)), |
| GURL("mojo:mojo_native_viewport_service")); |
| +#if defined(OS_LINUX) |
| + service_manager_.SetLoaderForScheme( |
| + scoped_ptr<ServiceLoader>(new DBusServiceLoader(this)), |
| + "dbus"); |
| +#endif // defined(OS_LINUX) |
| + |
| if (cmdline->HasSwitch(switches::kSpy)) { |
| spy_.reset(new mojo::Spy(&service_manager_, |
| cmdline->GetSwitchValueASCII(switches::kSpy))); |