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 | 9 |
10 #include "base/auto_reset.h" | 10 #include "base/auto_reset.h" |
(...skipping 1681 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1692 | 1692 |
1693 void RenderFrameImpl::OnUpdateOpener(int opener_routing_id) { | 1693 void RenderFrameImpl::OnUpdateOpener(int opener_routing_id) { |
1694 WebFrame* opener = ResolveOpener(opener_routing_id, nullptr); | 1694 WebFrame* opener = ResolveOpener(opener_routing_id, nullptr); |
1695 frame_->setOpener(opener); | 1695 frame_->setOpener(opener); |
1696 } | 1696 } |
1697 | 1697 |
1698 void RenderFrameImpl::OnDidUpdateSandboxFlags(blink::WebSandboxFlags flags) { | 1698 void RenderFrameImpl::OnDidUpdateSandboxFlags(blink::WebSandboxFlags flags) { |
1699 frame_->setFrameOwnerSandboxFlags(flags); | 1699 frame_->setFrameOwnerSandboxFlags(flags); |
1700 } | 1700 } |
1701 | 1701 |
1702 void RenderFrameImpl::OnClearFocus() { | 1702 void RenderFrameImpl::OnClearFocus(int focused_frame_routing_id) { |
1703 frame_->clearFocus(); | 1703 RenderFrameProxy* focused_frame_proxy = |
| 1704 RenderFrameProxy::FromRoutingID(focused_frame_routing_id); |
| 1705 frame_->clearFocus(focused_frame_proxy ? focused_frame_proxy->web_frame() |
| 1706 : nullptr); |
1704 } | 1707 } |
1705 | 1708 |
1706 void RenderFrameImpl::OnTextTrackSettingsChanged( | 1709 void RenderFrameImpl::OnTextTrackSettingsChanged( |
1707 const FrameMsg_TextTrackSettings_Params& params) { | 1710 const FrameMsg_TextTrackSettings_Params& params) { |
1708 DCHECK(!frame_->parent()); | 1711 DCHECK(!frame_->parent()); |
1709 if (!render_view_->webview()) | 1712 if (!render_view_->webview()) |
1710 return; | 1713 return; |
1711 | 1714 |
1712 if (params.text_tracks_enabled) { | 1715 if (params.text_tracks_enabled) { |
1713 render_view_->webview()->settings()->setTextTrackKindUserPreference( | 1716 render_view_->webview()->settings()->setTextTrackKindUserPreference( |
(...skipping 3537 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
5251 mojo::ServiceProviderPtr service_provider; | 5254 mojo::ServiceProviderPtr service_provider; |
5252 mojo::URLRequestPtr request(mojo::URLRequest::New()); | 5255 mojo::URLRequestPtr request(mojo::URLRequest::New()); |
5253 request->url = mojo::String::From(url); | 5256 request->url = mojo::String::From(url); |
5254 mojo_shell_->ConnectToApplication(request.Pass(), GetProxy(&service_provider), | 5257 mojo_shell_->ConnectToApplication(request.Pass(), GetProxy(&service_provider), |
5255 nullptr, nullptr, | 5258 nullptr, nullptr, |
5256 base::Bind(&OnGotContentHandlerID)); | 5259 base::Bind(&OnGotContentHandlerID)); |
5257 return service_provider.Pass(); | 5260 return service_provider.Pass(); |
5258 } | 5261 } |
5259 | 5262 |
5260 } // namespace content | 5263 } // namespace content |
OLD | NEW |