chrome/browser/printing/print_preview_tab_controller.cc - Issue 8253002: Move PageTransition into content namespace. While I'm touching all these files, I've also updated...

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_tab_controller.cc

Issue 8253002: Move PageTransition into content namespace. While I'm touching all these files, I've also updated... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/

Patch Set: '' Created 9 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/printing/cloud_print/cloud_print_setup_flow.cc ('k') | chrome/browser/printing/print_preview_tab_controller_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/printing/print_preview_tab_controller.cc

===================================================================

--- chrome/browser/printing/print_preview_tab_controller.cc (revision 105162)

+++ chrome/browser/printing/print_preview_tab_controller.cc (working copy)

@@ -196,11 +196,11 @@

TabContentsWrapper* preview_tab = GetPrintPreviewForTab(tab);

bool source_tab_is_preview_tab = (tab == preview_tab);

if (details) {

- PageTransition::Type transition_type = details->entry->transition_type();

+ content::PageTransition transition_type = details->entry->transition_type();

NavigationType::Type nav_type = details->type;

// Don't update/erase the map entry if the page has not changed.

- if (transition_type == PageTransition::RELOAD ||

+ if (transition_type == content::PAGE_TRANSITION_RELOAD ||

nav_type == NavigationType::SAME_PAGE) {

if (source_tab_is_preview_tab)

SetInitiatorTabURLAndTitle(preview_tab);

@@ -209,7 +209,7 @@

// New |preview_tab| is created. Don't update/erase map entry.

if (waiting_for_new_preview_page_ &&

- transition_type == PageTransition::LINK &&

+ transition_type == content::PAGE_TRANSITION_LINK &&

nav_type == NavigationType::NEW_PAGE &&

source_tab_is_preview_tab) {

waiting_for_new_preview_page_ = false;

@@ -219,7 +219,7 @@

// User navigated to a preview tab using forward/back button.

if (source_tab_is_preview_tab &&

- transition_type == PageTransition::FORWARD_BACK &&

+ transition_type == content::PAGE_TRANSITION_FORWARD_BACK &&

nav_type == NavigationType::EXISTING_PAGE) {

return;

}

@@ -296,7 +296,7 @@

// Add a new tab next to initiator tab.

browser::NavigateParams params(current_browser,

GURL(chrome::kChromeUIPrintURL),

- PageTransition::LINK);

+ content::PAGE_TRANSITION_LINK);

params.disposition = NEW_FOREGROUND_TAB;

if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kChromeFrame))

params.disposition = NEW_POPUP;