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 6211d5c39e99661f74f0542e1160510e06b3018d..42b3ea7b3ed742b600dff1f57d3877f81625968e 100644 |
--- a/chrome/browser/printing/print_preview_dialog_controller.cc |
+++ b/chrome/browser/printing/print_preview_dialog_controller.cc |
@@ -351,8 +351,12 @@ void PrintPreviewDialogController::OnNavEntryCommitted( |
ui::PageTransition type = details->entry->GetTransitionType(); |
content::NavigationType nav_type = details->type; |
if (nav_type == content::NAVIGATION_TYPE_EXISTING_PAGE && |
- (ui::PageTransitionCoreTypeIs(type, ui::PAGE_TRANSITION_TYPED) || |
- ui::PageTransitionCoreTypeIs(type, ui::PAGE_TRANSITION_LINK))) |
+ (ui::PageTransitionTypeIncludingQualifiersIs( |
+ type, |
+ ui::PageTransitionFromInt(ui::PAGE_TRANSITION_TYPED | |
+ ui::PAGE_TRANSITION_FROM_ADDRESS_BAR)) || |
+ ui::PageTransitionTypeIncludingQualifiersIs(type, |
+ ui::PAGE_TRANSITION_LINK))) |
return; |
} |
@@ -390,7 +394,6 @@ WebContents* PrintPreviewDialogController::CreatePrintPreviewDialog( |
AddObservers(initiator); |
AddObservers(preview_dialog); |
- |
return preview_dialog; |
} |
@@ -448,9 +451,7 @@ void PrintPreviewDialogController::RemoveInitiator( |
// initiator's observers. |
preview_dialog_map_[preview_dialog] = nullptr; |
RemoveObservers(initiator); |
- |
PrintViewManager::FromWebContents(initiator)->PrintPreviewDone(); |
- |
// initiator is closed. Close the print preview dialog too. |
if (content::WebUI* web_ui = preview_dialog->GetWebUI()) { |
PrintPreviewUI* print_preview_ui = |