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

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

Issue 2632633006: Implement NavigationThrottle::BLOCK_REQUEST_AND_COLLAPSE. (Closed)
Patch Set: Remove surplus semicolon. 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 270 matching lines...) Expand 10 before | Expand all | Expand 10 after
281 bool handled = true; 281 bool handled = true;
282 IPC_BEGIN_MESSAGE_MAP(RenderFrameProxy, msg) 282 IPC_BEGIN_MESSAGE_MAP(RenderFrameProxy, msg)
283 IPC_MESSAGE_HANDLER(FrameMsg_DeleteProxy, OnDeleteProxy) 283 IPC_MESSAGE_HANDLER(FrameMsg_DeleteProxy, OnDeleteProxy)
284 IPC_MESSAGE_HANDLER(FrameMsg_ChildFrameProcessGone, OnChildFrameProcessGone) 284 IPC_MESSAGE_HANDLER(FrameMsg_ChildFrameProcessGone, OnChildFrameProcessGone)
285 IPC_MESSAGE_HANDLER(FrameMsg_SetChildFrameSurface, OnSetChildFrameSurface) 285 IPC_MESSAGE_HANDLER(FrameMsg_SetChildFrameSurface, OnSetChildFrameSurface)
286 IPC_MESSAGE_HANDLER(FrameMsg_UpdateOpener, OnUpdateOpener) 286 IPC_MESSAGE_HANDLER(FrameMsg_UpdateOpener, OnUpdateOpener)
287 IPC_MESSAGE_HANDLER(FrameMsg_DidStartLoading, OnDidStartLoading) 287 IPC_MESSAGE_HANDLER(FrameMsg_DidStartLoading, OnDidStartLoading)
288 IPC_MESSAGE_HANDLER(FrameMsg_DidStopLoading, OnDidStopLoading) 288 IPC_MESSAGE_HANDLER(FrameMsg_DidStopLoading, OnDidStopLoading)
289 IPC_MESSAGE_HANDLER(FrameMsg_DidUpdateSandboxFlags, OnDidUpdateSandboxFlags) 289 IPC_MESSAGE_HANDLER(FrameMsg_DidUpdateSandboxFlags, OnDidUpdateSandboxFlags)
290 IPC_MESSAGE_HANDLER(FrameMsg_DispatchLoad, OnDispatchLoad) 290 IPC_MESSAGE_HANDLER(FrameMsg_DispatchLoad, OnDispatchLoad)
291 IPC_MESSAGE_HANDLER(FrameMsg_CollapseFrameOwner, OnCollapseFrameOwner)
291 IPC_MESSAGE_HANDLER(FrameMsg_DidUpdateName, OnDidUpdateName) 292 IPC_MESSAGE_HANDLER(FrameMsg_DidUpdateName, OnDidUpdateName)
292 IPC_MESSAGE_HANDLER(FrameMsg_AddContentSecurityPolicy, 293 IPC_MESSAGE_HANDLER(FrameMsg_AddContentSecurityPolicy,
293 OnAddContentSecurityPolicy) 294 OnAddContentSecurityPolicy)
294 IPC_MESSAGE_HANDLER(FrameMsg_ResetContentSecurityPolicy, 295 IPC_MESSAGE_HANDLER(FrameMsg_ResetContentSecurityPolicy,
295 OnResetContentSecurityPolicy) 296 OnResetContentSecurityPolicy)
296 IPC_MESSAGE_HANDLER(FrameMsg_EnforceInsecureRequestPolicy, 297 IPC_MESSAGE_HANDLER(FrameMsg_EnforceInsecureRequestPolicy,
297 OnEnforceInsecureRequestPolicy) 298 OnEnforceInsecureRequestPolicy)
298 IPC_MESSAGE_HANDLER(FrameMsg_SetFrameOwnerProperties, 299 IPC_MESSAGE_HANDLER(FrameMsg_SetFrameOwnerProperties,
299 OnSetFrameOwnerProperties) 300 OnSetFrameOwnerProperties)
300 IPC_MESSAGE_HANDLER(FrameMsg_DidUpdateOrigin, OnDidUpdateOrigin) 301 IPC_MESSAGE_HANDLER(FrameMsg_DidUpdateOrigin, OnDidUpdateOrigin)
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
352 } 353 }
353 354
354 void RenderFrameProxy::OnDidStopLoading() { 355 void RenderFrameProxy::OnDidStopLoading() {
355 web_frame_->didStopLoading(); 356 web_frame_->didStopLoading();
356 } 357 }
357 358
358 void RenderFrameProxy::OnDispatchLoad() { 359 void RenderFrameProxy::OnDispatchLoad() {
359 web_frame_->dispatchLoadEventOnFrameOwner(); 360 web_frame_->dispatchLoadEventOnFrameOwner();
360 } 361 }
361 362
363 void RenderFrameProxy::OnCollapseFrameOwner(bool collapsed) {
364 web_frame_->collapseFrameOwner(collapsed);
365 }
366
362 void RenderFrameProxy::OnDidUpdateName(const std::string& name, 367 void RenderFrameProxy::OnDidUpdateName(const std::string& name,
363 const std::string& unique_name) { 368 const std::string& unique_name) {
364 web_frame_->setReplicatedName(blink::WebString::fromUTF8(name), 369 web_frame_->setReplicatedName(blink::WebString::fromUTF8(name),
365 blink::WebString::fromUTF8(unique_name)); 370 blink::WebString::fromUTF8(unique_name));
366 } 371 }
367 372
368 void RenderFrameProxy::OnAddContentSecurityPolicy( 373 void RenderFrameProxy::OnAddContentSecurityPolicy(
369 const ContentSecurityPolicyHeader& header) { 374 const ContentSecurityPolicyHeader& header) {
370 web_frame_->addReplicatedContentSecurityPolicyHeader( 375 web_frame_->addReplicatedContentSecurityPolicyHeader(
371 blink::WebString::fromUTF8(header.header_value), header.type, 376 blink::WebString::fromUTF8(header.header_value), header.type,
(...skipping 148 matching lines...) Expand 10 before | Expand all | Expand 10 after
520 blink::WebLocalFrame* source) { 525 blink::WebLocalFrame* source) {
521 int source_routing_id = RenderFrameImpl::FromWebFrame(source)->GetRoutingID(); 526 int source_routing_id = RenderFrameImpl::FromWebFrame(source)->GetRoutingID();
522 Send(new FrameHostMsg_AdvanceFocus(routing_id_, type, source_routing_id)); 527 Send(new FrameHostMsg_AdvanceFocus(routing_id_, type, source_routing_id));
523 } 528 }
524 529
525 void RenderFrameProxy::frameFocused() { 530 void RenderFrameProxy::frameFocused() {
526 Send(new FrameHostMsg_FrameFocused(routing_id_)); 531 Send(new FrameHostMsg_FrameFocused(routing_id_));
527 } 532 }
528 533
529 } // namespace 534 } // namespace
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698