| 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 5869 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 5880 if (!media_session_manager_) | 5880 if (!media_session_manager_) |
| 5881 media_session_manager_ = new RendererMediaSessionManager(this); | 5881 media_session_manager_ = new RendererMediaSessionManager(this); |
| 5882 return media_session_manager_; | 5882 return media_session_manager_; |
| 5883 } | 5883 } |
| 5884 | 5884 |
| 5885 #endif // defined(OS_ANDROID) | 5885 #endif // defined(OS_ANDROID) |
| 5886 | 5886 |
| 5887 media::MediaPermission* RenderFrameImpl::GetMediaPermission() { | 5887 media::MediaPermission* RenderFrameImpl::GetMediaPermission() { |
| 5888 if (!media_permission_dispatcher_) { | 5888 if (!media_permission_dispatcher_) { |
| 5889 media_permission_dispatcher_.reset(new MediaPermissionDispatcher( | 5889 media_permission_dispatcher_.reset(new MediaPermissionDispatcher( |
| 5890 base::Bind(&RenderFrameImpl::GetInterface<PermissionService>, | 5890 base::Bind(&RenderFrameImpl::GetInterface<mojom::PermissionService>, |
| 5891 base::Unretained(this)))); | 5891 base::Unretained(this)))); |
| 5892 } | 5892 } |
| 5893 return media_permission_dispatcher_.get(); | 5893 return media_permission_dispatcher_.get(); |
| 5894 } | 5894 } |
| 5895 | 5895 |
| 5896 #if defined(ENABLE_MOJO_MEDIA) | 5896 #if defined(ENABLE_MOJO_MEDIA) |
| 5897 mojo::shell::mojom::InterfaceProvider* | 5897 mojo::shell::mojom::InterfaceProvider* |
| 5898 RenderFrameImpl::GetMediaInterfaceProvider() { | 5898 RenderFrameImpl::GetMediaInterfaceProvider() { |
| 5899 if (!media_interface_provider_) { | 5899 if (!media_interface_provider_) { |
| 5900 media_interface_provider_.reset(new MediaInterfaceProvider(base::Bind( | 5900 media_interface_provider_.reset(new MediaInterfaceProvider(base::Bind( |
| (...skipping 112 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 6013 int match_count, | 6013 int match_count, |
| 6014 int ordinal, | 6014 int ordinal, |
| 6015 const WebRect& selection_rect, | 6015 const WebRect& selection_rect, |
| 6016 bool final_status_update) { | 6016 bool final_status_update) { |
| 6017 Send(new FrameHostMsg_Find_Reply(routing_id_, request_id, match_count, | 6017 Send(new FrameHostMsg_Find_Reply(routing_id_, request_id, match_count, |
| 6018 selection_rect, ordinal, | 6018 selection_rect, ordinal, |
| 6019 final_status_update)); | 6019 final_status_update)); |
| 6020 } | 6020 } |
| 6021 | 6021 |
| 6022 } // namespace content | 6022 } // namespace content |
| OLD | NEW |