| 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 "content/renderer/render_frame_impl.h" | 5 #include "content/renderer/render_frame_impl.h" |
| 6 | 6 |
| 7 #include <map> | 7 #include <map> |
| 8 #include <string> | 8 #include <string> |
| 9 #include <utility> | 9 #include <utility> |
| 10 #include <vector> | 10 #include <vector> |
| (...skipping 6016 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 6027 #endif | 6027 #endif |
| 6028 return decoder_factory_.get(); | 6028 return decoder_factory_.get(); |
| 6029 } | 6029 } |
| 6030 | 6030 |
| 6031 void RenderFrameImpl::RegisterMojoServices() { | 6031 void RenderFrameImpl::RegisterMojoServices() { |
| 6032 // Only main frame have ImageDownloader service. | 6032 // Only main frame have ImageDownloader service. |
| 6033 if (!frame_->parent()) { | 6033 if (!frame_->parent()) { |
| 6034 GetServiceRegistry()->AddService(base::Bind( | 6034 GetServiceRegistry()->AddService(base::Bind( |
| 6035 &ImageDownloaderImpl::CreateMojoService, base::Unretained(this))); | 6035 &ImageDownloaderImpl::CreateMojoService, base::Unretained(this))); |
| 6036 } | 6036 } |
| 6037 GetServiceRegistry()->AddService(base::Bind( |
| 6038 &ManifestManager::BindToRequest, base::Unretained(manifest_manager_))); |
| 6037 } | 6039 } |
| 6038 | 6040 |
| 6039 template <typename Interface> | 6041 template <typename Interface> |
| 6040 void RenderFrameImpl::GetInterface(mojo::InterfaceRequest<Interface> request) { | 6042 void RenderFrameImpl::GetInterface(mojo::InterfaceRequest<Interface> request) { |
| 6041 GetServiceRegistry()->ConnectToRemoteService(std::move(request)); | 6043 GetServiceRegistry()->ConnectToRemoteService(std::move(request)); |
| 6042 } | 6044 } |
| 6043 | 6045 |
| 6044 shell::mojom::InterfaceProviderPtr RenderFrameImpl::ConnectToApplication( | 6046 shell::mojom::InterfaceProviderPtr RenderFrameImpl::ConnectToApplication( |
| 6045 const GURL& url) { | 6047 const GURL& url) { |
| 6046 if (!connector_) | 6048 if (!connector_) |
| (...skipping 107 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 6154 // event target. Potentially a Pepper plugin will receive the event. | 6156 // event target. Potentially a Pepper plugin will receive the event. |
| 6155 // In order to tell whether a plugin gets the last mouse event and which it | 6157 // In order to tell whether a plugin gets the last mouse event and which it |
| 6156 // is, we set |pepper_last_mouse_event_target_| to null here. If a plugin gets | 6158 // is, we set |pepper_last_mouse_event_target_| to null here. If a plugin gets |
| 6157 // the event, it will notify us via DidReceiveMouseEvent() and set itself as | 6159 // the event, it will notify us via DidReceiveMouseEvent() and set itself as |
| 6158 // |pepper_last_mouse_event_target_|. | 6160 // |pepper_last_mouse_event_target_|. |
| 6159 pepper_last_mouse_event_target_ = nullptr; | 6161 pepper_last_mouse_event_target_ = nullptr; |
| 6160 #endif | 6162 #endif |
| 6161 } | 6163 } |
| 6162 | 6164 |
| 6163 } // namespace content | 6165 } // namespace content |
| OLD | NEW |