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

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

Issue 562603002: Move PageTransition from //content/public/common to //ui/base (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 6 years, 3 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
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 c8e50d2f052dcb62a7a220be40a8b2a3830365a6..aac04bc723ecd0887c534e4c3a3ea4a019e3e818 100644
--- a/chrome/browser/printing/print_preview_dialog_controller.cc
+++ b/chrome/browser/printing/print_preview_dialog_controller.cc
@@ -337,13 +337,13 @@ void PrintPreviewDialogController::OnNavEntryCommitted(
if (contents == preview_dialog) {
// Preview dialog navigated.
if (details) {
- content::PageTransition transition_type =
+ ui::PageTransition transition_type =
details->entry->GetTransitionType();
content::NavigationType nav_type = details->type;
// New |preview_dialog| is created. Don't update/erase map entry.
if (waiting_for_new_preview_page_ &&
- transition_type == content::PAGE_TRANSITION_AUTO_TOPLEVEL &&
+ transition_type == ui::PAGE_TRANSITION_AUTO_TOPLEVEL &&
nav_type == content::NAVIGATION_TYPE_NEW_PAGE) {
waiting_for_new_preview_page_ = false;
SaveInitiatorTitle(preview_dialog);
@@ -352,7 +352,7 @@ void PrintPreviewDialogController::OnNavEntryCommitted(
// Cloud print sign-in causes a reload.
if (!waiting_for_new_preview_page_ &&
- transition_type == content::PAGE_TRANSITION_RELOAD &&
+ transition_type == ui::PAGE_TRANSITION_RELOAD &&
nav_type == content::NAVIGATION_TYPE_EXISTING_PAGE &&
IsPrintPreviewURL(details->previous_url)) {
return;
« no previous file with comments | « chrome/browser/printing/print_dialog_cloud.cc ('k') | chrome/browser/renderer_context_menu/render_view_context_menu.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698