chrome/browser/printing/print_preview_dialog_controller.cc - Issue 2225343002: Navigation: move RestoreType and ReloadType into a separate file

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/printing/print_preview_dialog_controller.cc

Issue 2225343002: Navigation: move RestoreType and ReloadType into a separate file (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: rebase+ Created 4 years, 4 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/net/predictor_tab_helper.cc ('k') | chrome/browser/sessions/session_restore_android.cc » ('j') | content/browser/frame_host/navigation_controller_impl.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/printing/print_preview_dialog_controller.cc

diff --git a/chrome/browser/printing/print_preview_dialog_controller.cc b/chrome/browser/printing/print_preview_dialog_controller.cc

index 7e0a8968c2607badf6289d644d9c25dc0135dfe1..56f192fac879bb83415a410e4677dba96aadbc3d 100644

--- a/chrome/browser/printing/print_preview_dialog_controller.cc

+++ b/chrome/browser/printing/print_preview_dialog_controller.cc

@@ -329,7 +329,7 @@ void PrintPreviewDialogController::OnNavEntryCommitted(

if (waiting_for_new_preview_page_ &&

ui::PageTransitionCoreTypeIs(transition_type,

ui::PAGE_TRANSITION_AUTO_TOPLEVEL) &&

- nav_type == content::NAVIGATION_TYPE_NEW_PAGE) {

+ nav_type == content::NavigationType::NEW_PAGE) {

waiting_for_new_preview_page_ = false;

SaveInitiatorTitle(preview_dialog);

return;

@@ -339,7 +339,7 @@ void PrintPreviewDialogController::OnNavEntryCommitted(

if (!waiting_for_new_preview_page_ &&

ui::PageTransitionCoreTypeIs(transition_type,

ui::PAGE_TRANSITION_RELOAD) &&

- nav_type == content::NAVIGATION_TYPE_EXISTING_PAGE &&

+ nav_type == content::NavigationType::EXISTING_PAGE &&

IsPrintPreviewURL(details->previous_url)) {

return;

}

@@ -350,7 +350,7 @@ void PrintPreviewDialogController::OnNavEntryCommitted(

if (details) {

ui::PageTransition type = details->entry->GetTransitionType();

content::NavigationType nav_type = details->type;

- if (nav_type == content::NAVIGATION_TYPE_EXISTING_PAGE &&

+ if (nav_type == content::NavigationType::EXISTING_PAGE &&

(ui::PageTransitionTypeIncludingQualifiersIs(

type,

ui::PageTransitionFromInt(ui::PAGE_TRANSITION_TYPED |