| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 #ifndef SHELL_APPLICATION_MANAGER_APPLICATION_MANAGER_H_ | 5 #ifndef SHELL_APPLICATION_MANAGER_APPLICATION_MANAGER_H_ |
| 6 #define SHELL_APPLICATION_MANAGER_APPLICATION_MANAGER_H_ | 6 #define SHELL_APPLICATION_MANAGER_APPLICATION_MANAGER_H_ |
| 7 | 7 |
| 8 #include <map> | 8 #include <map> |
| 9 | 9 |
| 10 #include "base/macros.h" | 10 #include "base/macros.h" |
| (...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 82 const GURL& requestor_url, | 82 const GURL& requestor_url, |
| 83 mojo::InterfaceRequest<mojo::ServiceProvider> services, | 83 mojo::InterfaceRequest<mojo::ServiceProvider> services, |
| 84 mojo::ServiceProviderPtr exposed_services, | 84 mojo::ServiceProviderPtr exposed_services, |
| 85 const base::Closure& on_application_end); | 85 const base::Closure& on_application_end); |
| 86 | 86 |
| 87 template <typename Interface> | 87 template <typename Interface> |
| 88 inline void ConnectToService(const GURL& application_url, | 88 inline void ConnectToService(const GURL& application_url, |
| 89 mojo::InterfacePtr<Interface>* ptr) { | 89 mojo::InterfacePtr<Interface>* ptr) { |
| 90 mojo::ScopedMessagePipeHandle service_handle = | 90 mojo::ScopedMessagePipeHandle service_handle = |
| 91 ConnectToServiceByName(application_url, Interface::Name_); | 91 ConnectToServiceByName(application_url, Interface::Name_); |
| 92 ptr->Bind(mojo::InterfacePtrInfo<Interface>(service_handle.Pass(), 0u)); | 92 ptr->Bind(mojo::InterfaceHandle<Interface>(service_handle.Pass(), 0u)); |
| 93 } | 93 } |
| 94 | 94 |
| 95 mojo::ScopedMessagePipeHandle ConnectToServiceByName( | 95 mojo::ScopedMessagePipeHandle ConnectToServiceByName( |
| 96 const GURL& application_url, | 96 const GURL& application_url, |
| 97 const std::string& interface_name); | 97 const std::string& interface_name); |
| 98 | 98 |
| 99 void RegisterContentHandler(const std::string& mime_type, | 99 void RegisterContentHandler(const std::string& mime_type, |
| 100 const GURL& content_handler_url); | 100 const GURL& content_handler_url); |
| 101 | 101 |
| 102 // Sets the default Loader to be used if not overridden by SetLoaderForURL() | 102 // Sets the default Loader to be used if not overridden by SetLoaderForURL() |
| (...skipping 152 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 255 ScopedVector<NativeRunner> native_runners_; | 255 ScopedVector<NativeRunner> native_runners_; |
| 256 bool initialized_authentication_interceptor_; | 256 bool initialized_authentication_interceptor_; |
| 257 base::WeakPtrFactory<ApplicationManager> weak_ptr_factory_; | 257 base::WeakPtrFactory<ApplicationManager> weak_ptr_factory_; |
| 258 | 258 |
| 259 DISALLOW_COPY_AND_ASSIGN(ApplicationManager); | 259 DISALLOW_COPY_AND_ASSIGN(ApplicationManager); |
| 260 }; | 260 }; |
| 261 | 261 |
| 262 } // namespace shell | 262 } // namespace shell |
| 263 | 263 |
| 264 #endif // SHELL_APPLICATION_MANAGER_APPLICATION_MANAGER_H_ | 264 #endif // SHELL_APPLICATION_MANAGER_APPLICATION_MANAGER_H_ |
| OLD | NEW |