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/browser/frame_host/navigator_impl.cc

Issue 241223002: Start using RenderFrameProxyHost objects. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Moar fixes. Created 6 years, 6 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 | Annotate | Revision Log
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/navigator_impl.h" 5 #include "content/browser/frame_host/navigator_impl.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "content/browser/frame_host/frame_tree.h" 8 #include "content/browser/frame_host/frame_tree.h"
9 #include "content/browser/frame_host/frame_tree_node.h" 9 #include "content/browser/frame_host/frame_tree_node.h"
10 #include "content/browser/frame_host/navigation_controller_impl.h" 10 #include "content/browser/frame_host/navigation_controller_impl.h"
(...skipping 385 matching lines...) Expand 10 before | Expand all | Expand 10 after
396 } 396 }
397 397
398 void NavigatorImpl::DidNavigate( 398 void NavigatorImpl::DidNavigate(
399 RenderFrameHostImpl* render_frame_host, 399 RenderFrameHostImpl* render_frame_host,
400 const FrameHostMsg_DidCommitProvisionalLoad_Params& input_params) { 400 const FrameHostMsg_DidCommitProvisionalLoad_Params& input_params) {
401 FrameHostMsg_DidCommitProvisionalLoad_Params params(input_params); 401 FrameHostMsg_DidCommitProvisionalLoad_Params params(input_params);
402 FrameTree* frame_tree = render_frame_host->frame_tree_node()->frame_tree(); 402 FrameTree* frame_tree = render_frame_host->frame_tree_node()->frame_tree();
403 bool use_site_per_process = 403 bool use_site_per_process =
404 CommandLine::ForCurrentProcess()->HasSwitch(switches::kSitePerProcess); 404 CommandLine::ForCurrentProcess()->HasSwitch(switches::kSitePerProcess);
405 405
406 LOG(ERROR) << "NI[" << this << "]::DidNavigate:";
406 if (use_site_per_process) { 407 if (use_site_per_process) {
407 // TODO(creis): Until we mirror the frame tree in the subframe's process, 408 // TODO(creis): Until we mirror the frame tree in the subframe's process,
408 // cross-process subframe navigations happen in a renderer's main frame. 409 // cross-process subframe navigations happen in a renderer's main frame.
409 // Correct the transition type here if we know it is for a subframe. 410 // Correct the transition type here if we know it is for a subframe.
410 NavigationEntryImpl* pending_entry = 411 NavigationEntryImpl* pending_entry =
411 NavigationEntryImpl::FromNavigationEntry( 412 NavigationEntryImpl::FromNavigationEntry(
412 controller_->GetPendingEntry()); 413 controller_->GetPendingEntry());
413 if (!render_frame_host->frame_tree_node()->IsMainFrame() && 414 if (!render_frame_host->frame_tree_node()->IsMainFrame() &&
414 pending_entry && 415 pending_entry &&
415 pending_entry->frame_tree_node_id() == 416 pending_entry->frame_tree_node_id() ==
(...skipping 215 matching lines...) Expand 10 before | Expand all | Expand 10 after
631 632
632 // Navigations in Web UI pages count as browser-initiated navigations. 633 // Navigations in Web UI pages count as browser-initiated navigations.
633 params.is_renderer_initiated = false; 634 params.is_renderer_initiated = false;
634 } 635 }
635 636
636 if (delegate_) 637 if (delegate_)
637 delegate_->RequestOpenURL(render_frame_host, params); 638 delegate_->RequestOpenURL(render_frame_host, params);
638 } 639 }
639 640
640 } // namespace content 641 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/frame_host/frame_tree_browsertest.cc ('k') | content/browser/frame_host/render_frame_host_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698