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

Side by Side Diff: content/browser/frame_host/render_frame_host_impl.cc

Issue 1550233002: Move mixed content settings histograms into browser (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: typo fix Created 4 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 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/browser/frame_host/render_frame_host_impl.h" 5 #include "content/browser/frame_host/render_frame_host_impl.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/containers/hash_tables.h" 10 #include "base/containers/hash_tables.h"
(...skipping 483 matching lines...) Expand 10 before | Expand all | Expand 10 after
494 frame_tree_node_->render_manager()->GetProxyToParent(); 494 frame_tree_node_->render_manager()->GetProxyToParent();
495 if (proxy && proxy->cross_process_frame_connector() && 495 if (proxy && proxy->cross_process_frame_connector() &&
496 proxy->cross_process_frame_connector()->OnMessageReceived(msg)) 496 proxy->cross_process_frame_connector()->OnMessageReceived(msg))
497 return true; 497 return true;
498 498
499 handled = true; 499 handled = true;
500 IPC_BEGIN_MESSAGE_MAP(RenderFrameHostImpl, msg) 500 IPC_BEGIN_MESSAGE_MAP(RenderFrameHostImpl, msg)
501 IPC_MESSAGE_HANDLER(FrameHostMsg_AddMessageToConsole, OnAddMessageToConsole) 501 IPC_MESSAGE_HANDLER(FrameHostMsg_AddMessageToConsole, OnAddMessageToConsole)
502 IPC_MESSAGE_HANDLER(FrameHostMsg_Detach, OnDetach) 502 IPC_MESSAGE_HANDLER(FrameHostMsg_Detach, OnDetach)
503 IPC_MESSAGE_HANDLER(FrameHostMsg_FrameFocused, OnFrameFocused) 503 IPC_MESSAGE_HANDLER(FrameHostMsg_FrameFocused, OnFrameFocused)
504 IPC_MESSAGE_HANDLER(FrameHostMsg_TriedDisplayingInsecureContent,
505 OnTriedDisplayingInsecureContent)
506 IPC_MESSAGE_HANDLER(FrameHostMsg_TriedRunningInsecureContent,
507 OnTriedRunningInsecureContent)
504 IPC_MESSAGE_HANDLER(FrameHostMsg_DidStartProvisionalLoad, 508 IPC_MESSAGE_HANDLER(FrameHostMsg_DidStartProvisionalLoad,
505 OnDidStartProvisionalLoad) 509 OnDidStartProvisionalLoad)
506 IPC_MESSAGE_HANDLER(FrameHostMsg_DidFailProvisionalLoadWithError, 510 IPC_MESSAGE_HANDLER(FrameHostMsg_DidFailProvisionalLoadWithError,
507 OnDidFailProvisionalLoadWithError) 511 OnDidFailProvisionalLoadWithError)
508 IPC_MESSAGE_HANDLER(FrameHostMsg_DidFailLoadWithError, 512 IPC_MESSAGE_HANDLER(FrameHostMsg_DidFailLoadWithError,
509 OnDidFailLoadWithError) 513 OnDidFailLoadWithError)
510 IPC_MESSAGE_HANDLER_GENERIC(FrameHostMsg_DidCommitProvisionalLoad, 514 IPC_MESSAGE_HANDLER_GENERIC(FrameHostMsg_DidCommitProvisionalLoad,
511 OnDidCommitProvisionalLoad(msg)) 515 OnDidCommitProvisionalLoad(msg))
512 IPC_MESSAGE_HANDLER(FrameHostMsg_DidDropNavigation, OnDidDropNavigation) 516 IPC_MESSAGE_HANDLER(FrameHostMsg_DidDropNavigation, OnDidDropNavigation)
513 IPC_MESSAGE_HANDLER(FrameHostMsg_UpdateState, OnUpdateState) 517 IPC_MESSAGE_HANDLER(FrameHostMsg_UpdateState, OnUpdateState)
(...skipping 302 matching lines...) Expand 10 before | Expand all | Expand 10 after
816 } 820 }
817 821
818 void RenderFrameHostImpl::OnDetach() { 822 void RenderFrameHostImpl::OnDetach() {
819 frame_tree_->RemoveFrame(frame_tree_node_); 823 frame_tree_->RemoveFrame(frame_tree_node_);
820 } 824 }
821 825
822 void RenderFrameHostImpl::OnFrameFocused() { 826 void RenderFrameHostImpl::OnFrameFocused() {
823 frame_tree_->SetFocusedFrame(frame_tree_node_, GetSiteInstance()); 827 frame_tree_->SetFocusedFrame(frame_tree_node_, GetSiteInstance());
824 } 828 }
825 829
830 void RenderFrameHostImpl::OnTriedDisplayingInsecureContent(const GURL& origin,
831 const GURL& url) {
832 delegate_->TriedDisplayingInsecureContent(this, origin, url);
833 }
834
835 void RenderFrameHostImpl::OnTriedRunningInsecureContent(const GURL& origin,
836 const GURL& url) {
837 delegate_->TriedRunningInsecureContent(this, origin, url);
838 }
839
826 void RenderFrameHostImpl::OnOpenURL(const FrameHostMsg_OpenURL_Params& params) { 840 void RenderFrameHostImpl::OnOpenURL(const FrameHostMsg_OpenURL_Params& params) {
827 if (params.is_history_navigation_in_new_child) { 841 if (params.is_history_navigation_in_new_child) {
828 DCHECK(SiteIsolationPolicy::UseSubframeNavigationEntries()); 842 DCHECK(SiteIsolationPolicy::UseSubframeNavigationEntries());
829 843
830 // Try to find a FrameNavigationEntry that matches this frame instead, based 844 // Try to find a FrameNavigationEntry that matches this frame instead, based
831 // on the frame's unique name. If this can't be found, fall back to the 845 // on the frame's unique name. If this can't be found, fall back to the
832 // default params using OpenURL below. 846 // default params using OpenURL below.
833 if (frame_tree_node_->navigator()->NavigateNewChildFrame( 847 if (frame_tree_node_->navigator()->NavigateNewChildFrame(
834 this, params.frame_unique_name)) 848 this, params.frame_unique_name))
835 return; 849 return;
(...skipping 1688 matching lines...) Expand 10 before | Expand all | Expand 10 after
2524 *dst = src; 2538 *dst = src;
2525 2539
2526 if (src.routing_id != -1) 2540 if (src.routing_id != -1)
2527 dst->tree_id = RoutingIDToAXTreeID(src.routing_id); 2541 dst->tree_id = RoutingIDToAXTreeID(src.routing_id);
2528 2542
2529 if (src.parent_routing_id != -1) 2543 if (src.parent_routing_id != -1)
2530 dst->parent_tree_id = RoutingIDToAXTreeID(src.parent_routing_id); 2544 dst->parent_tree_id = RoutingIDToAXTreeID(src.parent_routing_id);
2531 } 2545 }
2532 2546
2533 } // namespace content 2547 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698