chrome/browser/ui/tabs/tab_strip_model_order_controller.cc - Issue 562603002: Move PageTransition from //content/public/common to //ui/base

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/ui/tabs/tab_strip_model_order_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

« no previous file with comments | « chrome/browser/ui/tabs/tab_strip_model_order_controller.h ('k') | chrome/browser/ui/tabs/tab_strip_model_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/tabs/tab_strip_model_order_controller.cc

diff --git a/chrome/browser/ui/tabs/tab_strip_model_order_controller.cc b/chrome/browser/ui/tabs/tab_strip_model_order_controller.cc

index 52e8758ddf7bd4c050aecd5b7f0a3696f72c7d52..b91b34877dbe981cd9d4d6bd89ef17ddfa48cf16 100644

--- a/chrome/browser/ui/tabs/tab_strip_model_order_controller.cc

+++ b/chrome/browser/ui/tabs/tab_strip_model_order_controller.cc

@@ -20,7 +20,7 @@ TabStripModelOrderController::~TabStripModelOrderController() {

}

int TabStripModelOrderController::DetermineInsertionIndex(

- content::PageTransition transition,

+ ui::PageTransition transition,

bool foreground) {

int tab_count = tabstrip_->count();

if (!tab_count)

@@ -28,7 +28,7 @@ int TabStripModelOrderController::DetermineInsertionIndex(

// NOTE: TabStripModel enforces that all non-mini-tabs occur after mini-tabs,

// so we don't have to check here too.

- if (transition == content::PAGE_TRANSITION_LINK &&

+ if (transition == ui::PAGE_TRANSITION_LINK &&

tabstrip_->active_index() != -1) {

if (foreground) {

// If the page was opened in the foreground by a link click in another

« no previous file with comments | « chrome/browser/ui/tabs/tab_strip_model_order_controller.h ('k') | chrome/browser/ui/tabs/tab_strip_model_unittest.cc » ('j') | no next file with comments »