| 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 "build/build_config.h" | 7 #include "build/build_config.h" |
| 8 #include "base/command_line.h" | 8 #include "base/command_line.h" |
| 9 #include "base/lazy_instance.h" | 9 #include "base/lazy_instance.h" |
| 10 #include "base/memory/scoped_vector.h" | 10 #include "base/memory/scoped_vector.h" |
| (...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 54 } // namespace | 54 } // namespace |
| 55 | 55 |
| 56 class Context::NativeViewportServiceLoader : public ServiceLoader { | 56 class Context::NativeViewportServiceLoader : public ServiceLoader { |
| 57 public: | 57 public: |
| 58 explicit NativeViewportServiceLoader(Context* context) : context_(context) {} | 58 explicit NativeViewportServiceLoader(Context* context) : context_(context) {} |
| 59 virtual ~NativeViewportServiceLoader() {} | 59 virtual ~NativeViewportServiceLoader() {} |
| 60 | 60 |
| 61 private: | 61 private: |
| 62 virtual void LoadService(ServiceManager* manager, | 62 virtual void LoadService(ServiceManager* manager, |
| 63 const GURL& url, | 63 const GURL& url, |
| 64 ScopedShellHandle service_handle) OVERRIDE { | 64 ScopedMessagePipeHandle service_handle) OVERRIDE { |
| 65 app_.reset(::CreateNativeViewportService(context_, service_handle.Pass())); | 65 app_.reset(::CreateNativeViewportService(context_, service_handle.Pass())); |
| 66 } | 66 } |
| 67 | 67 |
| 68 virtual void OnServiceError(ServiceManager* manager, | 68 virtual void OnServiceError(ServiceManager* manager, |
| 69 const GURL& url) OVERRIDE { | 69 const GURL& url) OVERRIDE { |
| 70 } | 70 } |
| 71 | 71 |
| 72 Context* context_; | 72 Context* context_; |
| 73 scoped_ptr<Application> app_; | 73 scoped_ptr<Application> app_; |
| 74 DISALLOW_COPY_AND_ASSIGN(NativeViewportServiceLoader); | 74 DISALLOW_COPY_AND_ASSIGN(NativeViewportServiceLoader); |
| (...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 128 #if defined(USE_AURA) | 128 #if defined(USE_AURA) |
| 129 service_manager_.SetLoaderForURL( | 129 service_manager_.SetLoaderForURL( |
| 130 scoped_ptr<ServiceLoader>(), | 130 scoped_ptr<ServiceLoader>(), |
| 131 GURL("mojo:mojo_view_manager")); | 131 GURL("mojo:mojo_view_manager")); |
| 132 #endif | 132 #endif |
| 133 service_manager_.set_default_loader(scoped_ptr<ServiceLoader>()); | 133 service_manager_.set_default_loader(scoped_ptr<ServiceLoader>()); |
| 134 } | 134 } |
| 135 | 135 |
| 136 } // namespace shell | 136 } // namespace shell |
| 137 } // namespace mojo | 137 } // namespace mojo |
| OLD | NEW |