| 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 6057 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 6068 const GURL& url) { | 6068 const GURL& url) { |
| 6069 if (!mojo_shell_) | 6069 if (!mojo_shell_) |
| 6070 GetServiceRegistry()->ConnectToRemoteService(mojo::GetProxy(&mojo_shell_)); | 6070 GetServiceRegistry()->ConnectToRemoteService(mojo::GetProxy(&mojo_shell_)); |
| 6071 mojo::shell::mojom::InterfaceProviderPtr interface_provider; | 6071 mojo::shell::mojom::InterfaceProviderPtr interface_provider; |
| 6072 mojo::shell::mojom::CapabilityFilterPtr filter( | 6072 mojo::shell::mojom::CapabilityFilterPtr filter( |
| 6073 mojo::shell::mojom::CapabilityFilter::New()); | 6073 mojo::shell::mojom::CapabilityFilter::New()); |
| 6074 mojo::Array<mojo::String> all_interfaces; | 6074 mojo::Array<mojo::String> all_interfaces; |
| 6075 all_interfaces.push_back("*"); | 6075 all_interfaces.push_back("*"); |
| 6076 filter->filter.insert("*", std::move(all_interfaces)); | 6076 filter->filter.insert("*", std::move(all_interfaces)); |
| 6077 mojo_shell_->Connect( | 6077 mojo_shell_->Connect( |
| 6078 url.spec(), GetProxy(&interface_provider), nullptr, | 6078 url.spec(), mojo::shell::mojom::Shell::kUserInherit, |
| 6079 std::move(filter), base::Bind(&OnGotInstanceID)); | 6079 GetProxy(&interface_provider), nullptr, std::move(filter), |
| 6080 base::Bind(&OnGotInstanceID)); |
| 6080 return interface_provider; | 6081 return interface_provider; |
| 6081 } | 6082 } |
| 6082 | 6083 |
| 6083 media::RendererWebMediaPlayerDelegate* | 6084 media::RendererWebMediaPlayerDelegate* |
| 6084 RenderFrameImpl::GetWebMediaPlayerDelegate() { | 6085 RenderFrameImpl::GetWebMediaPlayerDelegate() { |
| 6085 if (!media_player_delegate_) | 6086 if (!media_player_delegate_) |
| 6086 media_player_delegate_ = new media::RendererWebMediaPlayerDelegate(this); | 6087 media_player_delegate_ = new media::RendererWebMediaPlayerDelegate(this); |
| 6087 return media_player_delegate_; | 6088 return media_player_delegate_; |
| 6088 } | 6089 } |
| 6089 | 6090 |
| (...skipping 26 matching lines...) Expand all Loading... |
| 6116 int match_count, | 6117 int match_count, |
| 6117 int ordinal, | 6118 int ordinal, |
| 6118 const WebRect& selection_rect, | 6119 const WebRect& selection_rect, |
| 6119 bool final_status_update) { | 6120 bool final_status_update) { |
| 6120 Send(new FrameHostMsg_Find_Reply(routing_id_, request_id, match_count, | 6121 Send(new FrameHostMsg_Find_Reply(routing_id_, request_id, match_count, |
| 6121 selection_rect, ordinal, | 6122 selection_rect, ordinal, |
| 6122 final_status_update)); | 6123 final_status_update)); |
| 6123 } | 6124 } |
| 6124 | 6125 |
| 6125 } // namespace content | 6126 } // namespace content |
| OLD | NEW |