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

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

Issue 2383303002: Notify the renderer if a history navigation has no subframe items. (Closed)
Patch Set: Created 4 years, 2 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
« no previous file with comments | « content/browser/frame_host/navigation_request.cc ('k') | content/common/frame_messages.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 <utility> 7 #include <utility>
8 8
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "base/metrics/histogram.h" 10 #include "base/metrics/histogram.h"
(...skipping 382 matching lines...) Expand 10 before | Expand all | Expand 10 after
393 FrameMsg_Navigate_Type::Value navigation_type = GetNavigationType( 393 FrameMsg_Navigate_Type::Value navigation_type = GetNavigationType(
394 controller_->GetBrowserContext(), entry, reload_type); 394 controller_->GetBrowserContext(), entry, reload_type);
395 dest_render_frame_host->Navigate( 395 dest_render_frame_host->Navigate(
396 entry.ConstructCommonNavigationParams( 396 entry.ConstructCommonNavigationParams(
397 frame_entry, post_body, dest_url, dest_referrer, navigation_type, 397 frame_entry, post_body, dest_url, dest_referrer, navigation_type,
398 lofi_state, navigation_start), 398 lofi_state, navigation_start),
399 entry.ConstructStartNavigationParams(), 399 entry.ConstructStartNavigationParams(),
400 entry.ConstructRequestNavigationParams( 400 entry.ConstructRequestNavigationParams(
401 frame_entry, is_same_document_history_load, 401 frame_entry, is_same_document_history_load,
402 is_history_navigation_in_new_child, 402 is_history_navigation_in_new_child,
403 entry.HasSubtreeHistoryItems(frame_tree_node),
403 frame_tree_node->has_committed_real_load(), 404 frame_tree_node->has_committed_real_load(),
404 controller_->GetPendingEntryIndex() == -1, 405 controller_->GetPendingEntryIndex() == -1,
405 controller_->GetIndexOfEntry(&entry), 406 controller_->GetIndexOfEntry(&entry),
406 controller_->GetLastCommittedEntryIndex(), 407 controller_->GetLastCommittedEntryIndex(),
407 controller_->GetEntryCount())); 408 controller_->GetEntryCount()));
408 } else { 409 } else {
409 // No need to navigate again. Just resume the deferred request. 410 // No need to navigate again. Just resume the deferred request.
410 dest_render_frame_host->GetProcess()->ResumeDeferredNavigation( 411 dest_render_frame_host->GetProcess()->ResumeDeferredNavigation(
411 entry.transferred_global_request_id()); 412 entry.transferred_global_request_id());
412 } 413 }
(...skipping 796 matching lines...) Expand 10 before | Expand all | Expand 10 after
1209 if (pending_entry != controller_->GetVisibleEntry() || 1210 if (pending_entry != controller_->GetVisibleEntry() ||
1210 !should_preserve_entry) { 1211 !should_preserve_entry) {
1211 controller_->DiscardPendingEntry(true); 1212 controller_->DiscardPendingEntry(true);
1212 1213
1213 // Also force the UI to refresh. 1214 // Also force the UI to refresh.
1214 controller_->delegate()->NotifyNavigationStateChanged(INVALIDATE_TYPE_URL); 1215 controller_->delegate()->NotifyNavigationStateChanged(INVALIDATE_TYPE_URL);
1215 } 1216 }
1216 } 1217 }
1217 1218
1218 } // namespace content 1219 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/frame_host/navigation_request.cc ('k') | content/common/frame_messages.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698