| 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 1601 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1612 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); | 1612 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); |
| 1613 delegate_->ToggleFullscreenMode(enter_fullscreen); | 1613 delegate_->ToggleFullscreenMode(enter_fullscreen); |
| 1614 // We need to notify the contents that its fullscreen state has changed. This | 1614 // We need to notify the contents that its fullscreen state has changed. This |
| 1615 // is done as part of the resize message. | 1615 // is done as part of the resize message. |
| 1616 WasResized(); | 1616 WasResized(); |
| 1617 } | 1617 } |
| 1618 | 1618 |
| 1619 void RenderViewHostImpl::OnOpenURL( | 1619 void RenderViewHostImpl::OnOpenURL( |
| 1620 const ViewHostMsg_OpenURL_Params& params) { | 1620 const ViewHostMsg_OpenURL_Params& params) { |
| 1621 GURL validated_url(params.url); | 1621 GURL validated_url(params.url); |
| 1622 GetProcess()->FilterURL(false, &validated_url); | 1622 // BrowserPluginGuest does filtering after firing a loadabort event. |
| 1623 if (!GetProcess()->IsGuest()) |
| 1624 GetProcess()->FilterURL(false, &validated_url); |
| 1623 | 1625 |
| 1624 delegate_->RequestOpenURL( | 1626 delegate_->RequestOpenURL( |
| 1625 this, validated_url, params.referrer, params.disposition, params.frame_id, | 1627 this, validated_url, params.referrer, params.disposition, params.frame_id, |
| 1626 params.should_replace_current_entry, params.user_gesture); | 1628 params.should_replace_current_entry, params.user_gesture); |
| 1627 } | 1629 } |
| 1628 | 1630 |
| 1629 void RenderViewHostImpl::OnDidContentsPreferredSizeChange( | 1631 void RenderViewHostImpl::OnDidContentsPreferredSizeChange( |
| 1630 const gfx::Size& new_size) { | 1632 const gfx::Size& new_size) { |
| 1631 delegate_->UpdatePreferredSize(new_size); | 1633 delegate_->UpdatePreferredSize(new_size); |
| 1632 } | 1634 } |
| (...skipping 604 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2237 void RenderViewHostImpl::AttachToFrameTree() { | 2239 void RenderViewHostImpl::AttachToFrameTree() { |
| 2238 FrameTree* frame_tree = delegate_->GetFrameTree(); | 2240 FrameTree* frame_tree = delegate_->GetFrameTree(); |
| 2239 | 2241 |
| 2240 frame_tree->ResetForMainFrameSwap(); | 2242 frame_tree->ResetForMainFrameSwap(); |
| 2241 if (main_frame_id() != FrameTreeNode::kInvalidFrameId) { | 2243 if (main_frame_id() != FrameTreeNode::kInvalidFrameId) { |
| 2242 frame_tree->OnFirstNavigationAfterSwap(main_frame_id()); | 2244 frame_tree->OnFirstNavigationAfterSwap(main_frame_id()); |
| 2243 } | 2245 } |
| 2244 } | 2246 } |
| 2245 | 2247 |
| 2246 } // namespace content | 2248 } // namespace content |
| OLD | NEW |