OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/browser/renderer_host/render_view_host_impl.h" | 5 #include "content/browser/renderer_host/render_view_host_impl.h" |
6 | 6 |
7 #include <set> | 7 #include <set> |
8 #include <string> | 8 #include <string> |
9 #include <utility> | 9 #include <utility> |
10 #include <vector> | 10 #include <vector> |
(...skipping 1616 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1627 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); | 1627 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); |
1628 delegate_->ToggleFullscreenMode(enter_fullscreen); | 1628 delegate_->ToggleFullscreenMode(enter_fullscreen); |
1629 // We need to notify the contents that its fullscreen state has changed. This | 1629 // We need to notify the contents that its fullscreen state has changed. This |
1630 // is done as part of the resize message. | 1630 // is done as part of the resize message. |
1631 WasResized(); | 1631 WasResized(); |
1632 } | 1632 } |
1633 | 1633 |
1634 void RenderViewHostImpl::OnOpenURL( | 1634 void RenderViewHostImpl::OnOpenURL( |
1635 const ViewHostMsg_OpenURL_Params& params) { | 1635 const ViewHostMsg_OpenURL_Params& params) { |
1636 GURL validated_url(params.url); | 1636 GURL validated_url(params.url); |
1637 GetProcess()->FilterURL(false, &validated_url); | 1637 // BrowserPluginGuest does filtering after firing a loadabort event. |
| 1638 if (!GetProcess()->IsGuest()) |
| 1639 GetProcess()->FilterURL(false, &validated_url); |
1638 | 1640 |
1639 delegate_->RequestOpenURL( | 1641 delegate_->RequestOpenURL( |
1640 this, validated_url, params.referrer, params.disposition, params.frame_id, | 1642 this, validated_url, params.referrer, params.disposition, params.frame_id, |
1641 params.should_replace_current_entry, params.user_gesture); | 1643 params.should_replace_current_entry, params.user_gesture); |
1642 } | 1644 } |
1643 | 1645 |
1644 void RenderViewHostImpl::OnDidContentsPreferredSizeChange( | 1646 void RenderViewHostImpl::OnDidContentsPreferredSizeChange( |
1645 const gfx::Size& new_size) { | 1647 const gfx::Size& new_size) { |
1646 delegate_->UpdatePreferredSize(new_size); | 1648 delegate_->UpdatePreferredSize(new_size); |
1647 } | 1649 } |
(...skipping 614 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2262 void RenderViewHostImpl::AttachToFrameTree() { | 2264 void RenderViewHostImpl::AttachToFrameTree() { |
2263 FrameTree* frame_tree = delegate_->GetFrameTree(); | 2265 FrameTree* frame_tree = delegate_->GetFrameTree(); |
2264 | 2266 |
2265 frame_tree->ResetForMainFrameSwap(); | 2267 frame_tree->ResetForMainFrameSwap(); |
2266 if (main_frame_id() != FrameTreeNode::kInvalidFrameId) { | 2268 if (main_frame_id() != FrameTreeNode::kInvalidFrameId) { |
2267 frame_tree->OnFirstNavigationAfterSwap(main_frame_id()); | 2269 frame_tree->OnFirstNavigationAfterSwap(main_frame_id()); |
2268 } | 2270 } |
2269 } | 2271 } |
2270 | 2272 |
2271 } // namespace content | 2273 } // namespace content |
OLD | NEW |