Move PageTransition from //content/public/common to //ui/base

chrome/browser/ui/tabs/tab_strip_model.cc

Index: chrome/browser/ui/tabs/tab_strip_model.cc
diff --git a/chrome/browser/ui/tabs/tab_strip_model.cc b/chrome/browser/ui/tabs/tab_strip_model.cc
index b3a596c0cc1475ac16c0e64c83834a20ece474cb..b7c60fbf90b974ee96176bae87dab73caad7e934 100644
--- a/chrome/browser/ui/tabs/tab_strip_model.cc
+++ b/chrome/browser/ui/tabs/tab_strip_model.cc
@@ -36,12 +36,12 @@ namespace {
 // forgotten. This is generally any navigation that isn't a link click (i.e.
 // any navigation that can be considered to be the start of a new task distinct
 // from what had previously occurred in that tab).
-bool ShouldForgetOpenersForTransition(content::PageTransition transition) {
-  return transition == content::PAGE_TRANSITION_TYPED ||
-      transition == content::PAGE_TRANSITION_AUTO_BOOKMARK ||
-      transition == content::PAGE_TRANSITION_GENERATED ||
-      transition == content::PAGE_TRANSITION_KEYWORD ||
-      transition == content::PAGE_TRANSITION_AUTO_TOPLEVEL;
+bool ShouldForgetOpenersForTransition(ui::PageTransition transition) {
+  return transition == ui::PAGE_TRANSITION_TYPED ||
+      transition == ui::PAGE_TRANSITION_AUTO_BOOKMARK ||
+      transition == ui::PAGE_TRANSITION_GENERATED ||
+      transition == ui::PAGE_TRANSITION_KEYWORD ||
+      transition == ui::PAGE_TRANSITION_AUTO_TOPLEVEL;
 }
 
 // CloseTracker is used when closing a set of WebContents. It listens for
@@ -605,7 +605,7 @@ int TabStripModel::GetIndexOfLastWebContentsOpenedBy(const WebContents* opener,
 }
 
 void TabStripModel::TabNavigating(WebContents* contents,
-                                  content::PageTransition transition) {
+                                  ui::PageTransition transition) {
   if (ShouldForgetOpenersForTransition(transition)) {
     // Don't forget the openers if this tab is a New Tab page opened at the
     // end of the TabStrip (e.g. by pressing Ctrl+T). Give the user one
@@ -783,14 +783,14 @@ void TabStripModel::SetSelectionFromModel(
 
 void TabStripModel::AddWebContents(WebContents* contents,
                                    int index,
-                                   content::PageTransition transition,
+                                   ui::PageTransition transition,
                                    int add_types) {
   // If the newly-opened tab is part of the same task as the parent tab, we want
   // to inherit the parent's "group" attribute, so that if this tab is then
   // closed we'll jump back to the parent tab.
   bool inherit_group = (add_types & ADD_INHERIT_GROUP) == ADD_INHERIT_GROUP;
 
-  if (transition == content::PAGE_TRANSITION_LINK &&
+  if (transition == ui::PAGE_TRANSITION_LINK &&
       (add_types & ADD_FORCE_INDEX) == 0) {
     // We assume tabs opened via link clicks are part of the same task as their
     // parent.  Note that when |force_index| is true (e.g. when the user
@@ -807,7 +807,7 @@ void TabStripModel::AddWebContents(WebContents* contents,
       index = count();
   }
 
-  if (transition == content::PAGE_TRANSITION_TYPED && index == count()) {
+  if (transition == ui::PAGE_TRANSITION_TYPED && index == count()) {
     // Also, any tab opened at the end of the TabStrip with a "TYPED"
     // transition inherit group as well. This covers the cases where the user
     // creates a New Tab (e.g. Ctrl+T, or clicks the New Tab button), or types
@@ -821,7 +821,7 @@ void TabStripModel::AddWebContents(WebContents* contents,
   // Reset the index, just in case insert ended up moving it on us.
   index = GetIndexOfWebContents(contents);
 
-  if (inherit_group && transition == content::PAGE_TRANSITION_TYPED)
+  if (inherit_group && transition == ui::PAGE_TRANSITION_TYPED)
     contents_data_[index]->set_reset_group_on_select(true);
 
   // TODO(sky): figure out why this is here and not in InsertWebContentsAt. When