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 <vector> | 7 #include <vector> |
8 | 8 |
9 #include "base/bind.h" | 9 #include "base/bind.h" |
10 #include "base/command_line.h" | 10 #include "base/command_line.h" |
(...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
95 LOG(ERROR) << "Invalid value for switch " << switches::kContentHandlers | 95 LOG(ERROR) << "Invalid value for switch " << switches::kContentHandlers |
96 << ": '" << parts[i + 1] << "' is not a valid URL."; | 96 << ": '" << parts[i + 1] << "' is not a valid URL."; |
97 return; | 97 return; |
98 } | 98 } |
99 loader->RegisterContentHandler(parts[i], url); | 99 loader->RegisterContentHandler(parts[i], url); |
100 } | 100 } |
101 } | 101 } |
102 | 102 |
103 class EmptyServiceProvider : public InterfaceImpl<ServiceProvider> { | 103 class EmptyServiceProvider : public InterfaceImpl<ServiceProvider> { |
104 private: | 104 private: |
105 virtual void ConnectToService(const mojo::String& service_name, | 105 virtual void ConnectToService( |
106 ScopedMessagePipeHandle client_handle) | 106 const mojo::String& service_name, |
107 MOJO_OVERRIDE { | 107 ScopedMessagePipeHandle client_handle) override {} |
108 } | |
109 }; | 108 }; |
110 | 109 |
111 } // namespace | 110 } // namespace |
112 | 111 |
113 #if defined(OS_ANDROID) | 112 #if defined(OS_ANDROID) |
114 class Context::NativeViewportApplicationLoader | 113 class Context::NativeViewportApplicationLoader |
115 : public ApplicationLoader, | 114 : public ApplicationLoader, |
116 public ApplicationDelegate, | 115 public ApplicationDelegate, |
117 public InterfaceFactory<NativeViewport>, | 116 public InterfaceFactory<NativeViewport>, |
118 public InterfaceFactory<Gpu> { | 117 public InterfaceFactory<Gpu> { |
(...skipping 149 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
268 ScopedMessagePipeHandle Context::ConnectToServiceByName( | 267 ScopedMessagePipeHandle Context::ConnectToServiceByName( |
269 const GURL& application_url, | 268 const GURL& application_url, |
270 const std::string& service_name) { | 269 const std::string& service_name) { |
271 app_urls_.insert(application_url); | 270 app_urls_.insert(application_url); |
272 return application_manager_.ConnectToServiceByName( | 271 return application_manager_.ConnectToServiceByName( |
273 application_url, service_name).Pass(); | 272 application_url, service_name).Pass(); |
274 } | 273 } |
275 | 274 |
276 } // namespace shell | 275 } // namespace shell |
277 } // namespace mojo | 276 } // namespace mojo |
OLD | NEW |