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

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

Issue 2632633006: Implement NavigationThrottle::BLOCK_REQUEST_AND_COLLAPSE. (Closed)
Patch Set: Moar tests. Created 3 years, 11 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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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_proxy.h" 5 #include "content/renderer/render_frame_proxy.h"
6 6
7 #include <stdint.h> 7 #include <stdint.h>
8 #include <map> 8 #include <map>
9 #include <utility> 9 #include <utility>
10 10
(...skipping 271 matching lines...) Expand 10 before | Expand all | Expand 10 after
282 bool handled = true; 282 bool handled = true;
283 IPC_BEGIN_MESSAGE_MAP(RenderFrameProxy, msg) 283 IPC_BEGIN_MESSAGE_MAP(RenderFrameProxy, msg)
284 IPC_MESSAGE_HANDLER(FrameMsg_DeleteProxy, OnDeleteProxy) 284 IPC_MESSAGE_HANDLER(FrameMsg_DeleteProxy, OnDeleteProxy)
285 IPC_MESSAGE_HANDLER(FrameMsg_ChildFrameProcessGone, OnChildFrameProcessGone) 285 IPC_MESSAGE_HANDLER(FrameMsg_ChildFrameProcessGone, OnChildFrameProcessGone)
286 IPC_MESSAGE_HANDLER(FrameMsg_SetChildFrameSurface, OnSetChildFrameSurface) 286 IPC_MESSAGE_HANDLER(FrameMsg_SetChildFrameSurface, OnSetChildFrameSurface)
287 IPC_MESSAGE_HANDLER(FrameMsg_UpdateOpener, OnUpdateOpener) 287 IPC_MESSAGE_HANDLER(FrameMsg_UpdateOpener, OnUpdateOpener)
288 IPC_MESSAGE_HANDLER(FrameMsg_DidStartLoading, OnDidStartLoading) 288 IPC_MESSAGE_HANDLER(FrameMsg_DidStartLoading, OnDidStartLoading)
289 IPC_MESSAGE_HANDLER(FrameMsg_DidStopLoading, OnDidStopLoading) 289 IPC_MESSAGE_HANDLER(FrameMsg_DidStopLoading, OnDidStopLoading)
290 IPC_MESSAGE_HANDLER(FrameMsg_DidUpdateSandboxFlags, OnDidUpdateSandboxFlags) 290 IPC_MESSAGE_HANDLER(FrameMsg_DidUpdateSandboxFlags, OnDidUpdateSandboxFlags)
291 IPC_MESSAGE_HANDLER(FrameMsg_DispatchLoad, OnDispatchLoad) 291 IPC_MESSAGE_HANDLER(FrameMsg_DispatchLoad, OnDispatchLoad)
292 IPC_MESSAGE_HANDLER(FrameMsg_CollapseFrameOwner, OnCollapseFrameOwner)
292 IPC_MESSAGE_HANDLER(FrameMsg_DidUpdateName, OnDidUpdateName) 293 IPC_MESSAGE_HANDLER(FrameMsg_DidUpdateName, OnDidUpdateName)
293 IPC_MESSAGE_HANDLER(FrameMsg_AddContentSecurityPolicy, 294 IPC_MESSAGE_HANDLER(FrameMsg_AddContentSecurityPolicy,
294 OnAddContentSecurityPolicy) 295 OnAddContentSecurityPolicy)
295 IPC_MESSAGE_HANDLER(FrameMsg_ResetContentSecurityPolicy, 296 IPC_MESSAGE_HANDLER(FrameMsg_ResetContentSecurityPolicy,
296 OnResetContentSecurityPolicy) 297 OnResetContentSecurityPolicy)
297 IPC_MESSAGE_HANDLER(FrameMsg_EnforceInsecureRequestPolicy, 298 IPC_MESSAGE_HANDLER(FrameMsg_EnforceInsecureRequestPolicy,
298 OnEnforceInsecureRequestPolicy) 299 OnEnforceInsecureRequestPolicy)
299 IPC_MESSAGE_HANDLER(FrameMsg_SetFrameOwnerProperties, 300 IPC_MESSAGE_HANDLER(FrameMsg_SetFrameOwnerProperties,
300 OnSetFrameOwnerProperties) 301 OnSetFrameOwnerProperties)
301 IPC_MESSAGE_HANDLER(FrameMsg_DidUpdateOrigin, OnDidUpdateOrigin) 302 IPC_MESSAGE_HANDLER(FrameMsg_DidUpdateOrigin, OnDidUpdateOrigin)
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
353 } 354 }
354 355
355 void RenderFrameProxy::OnDidStopLoading() { 356 void RenderFrameProxy::OnDidStopLoading() {
356 web_frame_->didStopLoading(); 357 web_frame_->didStopLoading();
357 } 358 }
358 359
359 void RenderFrameProxy::OnDispatchLoad() { 360 void RenderFrameProxy::OnDispatchLoad() {
360 web_frame_->dispatchLoadEventOnFrameOwner(); 361 web_frame_->dispatchLoadEventOnFrameOwner();
361 } 362 }
362 363
364 void RenderFrameProxy::OnCollapseFrameOwner(bool collapsed) {
365 web_frame_->collapseFrameOwner(collapsed);
366 }
367
363 void RenderFrameProxy::OnDidUpdateName(const std::string& name, 368 void RenderFrameProxy::OnDidUpdateName(const std::string& name,
364 const std::string& unique_name) { 369 const std::string& unique_name) {
365 web_frame_->setReplicatedName(blink::WebString::fromUTF8(name), 370 web_frame_->setReplicatedName(blink::WebString::fromUTF8(name),
366 blink::WebString::fromUTF8(unique_name)); 371 blink::WebString::fromUTF8(unique_name));
367 } 372 }
368 373
369 void RenderFrameProxy::OnAddContentSecurityPolicy( 374 void RenderFrameProxy::OnAddContentSecurityPolicy(
370 const ContentSecurityPolicyHeader& header) { 375 const ContentSecurityPolicyHeader& header) {
371 web_frame_->addReplicatedContentSecurityPolicyHeader( 376 web_frame_->addReplicatedContentSecurityPolicyHeader(
372 blink::WebString::fromUTF8(header.header_value), header.type, 377 blink::WebString::fromUTF8(header.header_value), header.type,
(...skipping 154 matching lines...) Expand 10 before | Expand all | Expand 10 after
527 blink::WebLocalFrame* source) { 532 blink::WebLocalFrame* source) {
528 int source_routing_id = RenderFrameImpl::FromWebFrame(source)->GetRoutingID(); 533 int source_routing_id = RenderFrameImpl::FromWebFrame(source)->GetRoutingID();
529 Send(new FrameHostMsg_AdvanceFocus(routing_id_, type, source_routing_id)); 534 Send(new FrameHostMsg_AdvanceFocus(routing_id_, type, source_routing_id));
530 } 535 }
531 536
532 void RenderFrameProxy::frameFocused() { 537 void RenderFrameProxy::frameFocused() {
533 Send(new FrameHostMsg_FrameFocused(routing_id_)); 538 Send(new FrameHostMsg_FrameFocused(routing_id_));
534 } 539 }
535 540
536 } // namespace 541 } // namespace
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698