Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(21)

Side by Side Diff: content/renderer/render_frame_impl.cc

Issue 2632633006: Implement NavigationThrottle::BLOCK_REQUEST_AND_COLLAPSE. (Closed)
Patch Set: Addressed comments from csharrison@. Created 3 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 1531 matching lines...) Expand 10 before | Expand all | Expand 10 after
1542 } 1542 }
1543 1543
1544 bool handled = true; 1544 bool handled = true;
1545 IPC_BEGIN_MESSAGE_MAP(RenderFrameImpl, msg) 1545 IPC_BEGIN_MESSAGE_MAP(RenderFrameImpl, msg)
1546 IPC_MESSAGE_HANDLER(FrameMsg_Navigate, OnNavigate) 1546 IPC_MESSAGE_HANDLER(FrameMsg_Navigate, OnNavigate)
1547 IPC_MESSAGE_HANDLER(FrameMsg_BeforeUnload, OnBeforeUnload) 1547 IPC_MESSAGE_HANDLER(FrameMsg_BeforeUnload, OnBeforeUnload)
1548 IPC_MESSAGE_HANDLER(FrameMsg_SwapOut, OnSwapOut) 1548 IPC_MESSAGE_HANDLER(FrameMsg_SwapOut, OnSwapOut)
1549 IPC_MESSAGE_HANDLER(FrameMsg_SwapIn, OnSwapIn) 1549 IPC_MESSAGE_HANDLER(FrameMsg_SwapIn, OnSwapIn)
1550 IPC_MESSAGE_HANDLER(FrameMsg_Delete, OnDeleteFrame) 1550 IPC_MESSAGE_HANDLER(FrameMsg_Delete, OnDeleteFrame)
1551 IPC_MESSAGE_HANDLER(FrameMsg_Stop, OnStop) 1551 IPC_MESSAGE_HANDLER(FrameMsg_Stop, OnStop)
1552 IPC_MESSAGE_HANDLER(FrameMsg_Collapse, OnCollapse)
1552 IPC_MESSAGE_HANDLER(FrameMsg_ContextMenuClosed, OnContextMenuClosed) 1553 IPC_MESSAGE_HANDLER(FrameMsg_ContextMenuClosed, OnContextMenuClosed)
1553 IPC_MESSAGE_HANDLER(FrameMsg_CustomContextMenuAction, 1554 IPC_MESSAGE_HANDLER(FrameMsg_CustomContextMenuAction,
1554 OnCustomContextMenuAction) 1555 OnCustomContextMenuAction)
1555 #if BUILDFLAG(ENABLE_PLUGINS) 1556 #if BUILDFLAG(ENABLE_PLUGINS)
1556 IPC_MESSAGE_HANDLER(FrameMsg_SetPepperVolume, OnSetPepperVolume) 1557 IPC_MESSAGE_HANDLER(FrameMsg_SetPepperVolume, OnSetPepperVolume)
1557 #endif 1558 #endif
1558 IPC_MESSAGE_HANDLER(InputMsg_Undo, OnUndo) 1559 IPC_MESSAGE_HANDLER(InputMsg_Undo, OnUndo)
1559 IPC_MESSAGE_HANDLER(InputMsg_Redo, OnRedo) 1560 IPC_MESSAGE_HANDLER(InputMsg_Redo, OnRedo)
1560 IPC_MESSAGE_HANDLER(InputMsg_Cut, OnCut) 1561 IPC_MESSAGE_HANDLER(InputMsg_Cut, OnCut)
1561 IPC_MESSAGE_HANDLER(InputMsg_Copy, OnCopy) 1562 IPC_MESSAGE_HANDLER(InputMsg_Copy, OnCopy)
(...skipping 3287 matching lines...) Expand 10 before | Expand all | Expand 10 after
4849 4850
4850 if (frame_ && !frame_->Parent()) { 4851 if (frame_ && !frame_->Parent()) {
4851 for (auto& observer : render_view_->observers_) 4852 for (auto& observer : render_view_->observers_)
4852 observer.OnStop(); 4853 observer.OnStop();
4853 } 4854 }
4854 4855
4855 for (auto& observer : observers_) 4856 for (auto& observer : observers_)
4856 observer.OnStop(); 4857 observer.OnStop();
4857 } 4858 }
4858 4859
4860 void RenderFrameImpl::OnCollapse(bool collapsed) {
4861 frame_->Collapse(collapsed);
4862 }
4863
4859 void RenderFrameImpl::WasHidden() { 4864 void RenderFrameImpl::WasHidden() {
4860 for (auto& observer : observers_) 4865 for (auto& observer : observers_)
4861 observer.WasHidden(); 4866 observer.WasHidden();
4862 4867
4863 #if BUILDFLAG(ENABLE_PLUGINS) 4868 #if BUILDFLAG(ENABLE_PLUGINS)
4864 for (auto* plugin : active_pepper_instances_) 4869 for (auto* plugin : active_pepper_instances_)
4865 plugin->PageVisibilityChanged(false); 4870 plugin->PageVisibilityChanged(false);
4866 #endif // ENABLE_PLUGINS 4871 #endif // ENABLE_PLUGINS
4867 4872
4868 if (GetWebFrame()->FrameWidget()) { 4873 if (GetWebFrame()->FrameWidget()) {
(...skipping 2180 matching lines...) Expand 10 before | Expand all | Expand 10 after
7049 policy(info.default_policy), 7054 policy(info.default_policy),
7050 replaces_current_history_item(info.replaces_current_history_item), 7055 replaces_current_history_item(info.replaces_current_history_item),
7051 history_navigation_in_new_child_frame( 7056 history_navigation_in_new_child_frame(
7052 info.is_history_navigation_in_new_child_frame), 7057 info.is_history_navigation_in_new_child_frame),
7053 client_redirect(info.is_client_redirect), 7058 client_redirect(info.is_client_redirect),
7054 cache_disabled(info.is_cache_disabled), 7059 cache_disabled(info.is_cache_disabled),
7055 form(info.form), 7060 form(info.form),
7056 source_location(info.source_location) {} 7061 source_location(info.source_location) {}
7057 7062
7058 } // namespace content 7063 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698