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

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

Issue 1432583002: Move browser_navigation_start to CommonNavigationParams (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Nasko review Created 5 years, 1 month 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/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 "base/metrics/histogram.h" 8 #include "base/metrics/histogram.h"
9 #include "base/time/time.h" 9 #include "base/time/time.h"
10 #include "content/browser/frame_host/frame_tree.h" 10 #include "content/browser/frame_host/frame_tree.h"
(...skipping 323 matching lines...) Expand 10 before | Expand all | Expand 10 after
334 entry.restore_type())); 334 entry.restore_type()));
335 // Create the navigation parameters. 335 // Create the navigation parameters.
336 FrameMsg_Navigate_Type::Value navigation_type = 336 FrameMsg_Navigate_Type::Value navigation_type =
337 GetNavigationType(controller_->GetBrowserContext(), entry, reload_type); 337 GetNavigationType(controller_->GetBrowserContext(), entry, reload_type);
338 LoFiState lofi_state = 338 LoFiState lofi_state =
339 (reload_type == 339 (reload_type ==
340 NavigationController::ReloadType::RELOAD_DISABLE_LOFI_MODE 340 NavigationController::ReloadType::RELOAD_DISABLE_LOFI_MODE
341 ? LOFI_OFF 341 ? LOFI_OFF
342 : LOFI_UNSPECIFIED); 342 : LOFI_UNSPECIFIED);
343 dest_render_frame_host->Navigate( 343 dest_render_frame_host->Navigate(
344 entry.ConstructCommonNavigationParams( 344 entry.ConstructCommonNavigationParams(dest_url, dest_referrer,
345 dest_url, dest_referrer, frame_entry, navigation_type, lofi_state), 345 frame_entry, navigation_type,
346 lofi_state, navigation_start),
346 entry.ConstructStartNavigationParams(), 347 entry.ConstructStartNavigationParams(),
347 entry.ConstructRequestNavigationParams( 348 entry.ConstructRequestNavigationParams(
348 frame_entry, navigation_start, is_same_document_history_load, 349 frame_entry, is_same_document_history_load,
349 frame_tree_node->has_committed_real_load(), 350 frame_tree_node->has_committed_real_load(),
350 controller_->GetPendingEntryIndex() == -1, 351 controller_->GetPendingEntryIndex() == -1,
351 controller_->GetIndexOfEntry(&entry), 352 controller_->GetIndexOfEntry(&entry),
352 controller_->GetLastCommittedEntryIndex(), 353 controller_->GetLastCommittedEntryIndex(),
353 controller_->GetEntryCount())); 354 controller_->GetEntryCount()));
354 } else { 355 } else {
355 // No need to navigate again. Just resume the deferred request. 356 // No need to navigate again. Just resume the deferred request.
356 dest_render_frame_host->GetProcess()->ResumeDeferredNavigation( 357 dest_render_frame_host->GetProcess()->ResumeDeferredNavigation(
357 entry.transferred_global_request_id()); 358 entry.transferred_global_request_id());
358 } 359 }
(...skipping 593 matching lines...) Expand 10 before | Expand all | Expand 10 after
952 entry->set_should_replace_entry(pending_entry->should_replace_entry()); 953 entry->set_should_replace_entry(pending_entry->should_replace_entry());
953 entry->SetRedirectChain(pending_entry->GetRedirectChain()); 954 entry->SetRedirectChain(pending_entry->GetRedirectChain());
954 } 955 }
955 controller_->SetPendingEntry(entry.Pass()); 956 controller_->SetPendingEntry(entry.Pass());
956 if (delegate_) 957 if (delegate_)
957 delegate_->NotifyChangedNavigationState(content::INVALIDATE_TYPE_URL); 958 delegate_->NotifyChangedNavigationState(content::INVALIDATE_TYPE_URL);
958 } 959 }
959 } 960 }
960 961
961 } // namespace content 962 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/frame_host/navigation_request.cc ('k') | content/browser/frame_host/render_frame_host_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698