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

chrome/browser/ui/browser_commands.cc

 // Copyright 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/browser_commands.h"
 
 #include "base/command_line.h"
 #include "base/metrics/histogram.h"
 #include "base/prefs/pref_service.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 195 matching lines @@
 // location bar contents, since all browser-UI-triggered navigations should
 // revert any omnibox edits in the current tab.
 WebContents* GetTabAndRevertIfNecessary(Browser* browser,
                                         WindowOpenDisposition disposition) {
   WebContents* current_tab = browser->tab_strip_model()->GetActiveWebContents();
   switch (disposition) {
     case NEW_FOREGROUND_TAB:
     case NEW_BACKGROUND_TAB: {
       WebContents* new_tab = current_tab->Clone();
       browser->tab_strip_model()->AddWebContents(
-          new_tab, -1, content::PAGE_TRANSITION_LINK,
+          new_tab, -1, ui::PAGE_TRANSITION_LINK,
           (disposition == NEW_FOREGROUND_TAB) ?
               TabStripModel::ADD_ACTIVE : TabStripModel::ADD_NONE);
       return new_tab;
     }
     case NEW_WINDOW: {
       WebContents* new_tab = current_tab->Clone();
       Browser* new_browser = new Browser(Browser::CreateParams(
           browser->profile(), browser->host_desktop_type()));
       new_browser->tab_strip_model()->AddWebContents(
-          new_tab, -1, content::PAGE_TRANSITION_LINK,
+          new_tab, -1, ui::PAGE_TRANSITION_LINK,
           TabStripModel::ADD_ACTIVE);
       new_browser->window()->Show();
       return new_tab;
     }
     default:
       browser->window()->GetLocationBar()->Revert();
       return current_tab;
   }
 }
 
@@ skipping 149 matching lines @@
   if (service)
     service->RestoreMostRecentEntry(NULL, host_desktop_type);
 }
 
 void OpenURLOffTheRecord(Profile* profile,
                          const GURL& url,
                          chrome::HostDesktopType desktop_type) {
   ScopedTabbedBrowserDisplayer displayer(profile->GetOffTheRecordProfile(),
                                          desktop_type);
   AddSelectedTabWithURL(displayer.browser(), url,
-      content::PAGE_TRANSITION_LINK);
+      ui::PAGE_TRANSITION_LINK);
 }
 
 bool CanGoBack(const Browser* browser) {
   return browser->tab_strip_model()->GetActiveWebContents()->
       GetController().CanGoBack();
 }
 
 void GoBack(Browser* browser, WindowOpenDisposition disposition) {
   content::RecordAction(UserMetricsAction("Back"));
 
@@ skipping 75 matching lines @@
                 extensions::ExtensionRegistry::EVERYTHING);
     if (!extension)
       return;
 
     url = extensions::AppLaunchInfo::GetLaunchWebURL(extension);
   }
 #endif
 
   OpenURLParams params(
       url, Referrer(), disposition,
-      content::PageTransitionFromInt(
-          content::PAGE_TRANSITION_AUTO_BOOKMARK |
-          content::PAGE_TRANSITION_HOME_PAGE),
+      ui::PageTransitionFromInt(
+          ui::PAGE_TRANSITION_AUTO_BOOKMARK |
+          ui::PAGE_TRANSITION_HOME_PAGE),
       false);
   params.extra_headers = extra_headers;
   browser->OpenURL(params);
 }
 
 void OpenCurrentURL(Browser* browser) {
   content::RecordAction(UserMetricsAction("LoadURL"));
   LocationBar* location_bar = browser->window()->GetLocationBar();
   if (!location_bar)
     return;
 
   GURL url(location_bar->GetDestinationURL());
 
-  content::PageTransition page_transition = location_bar->GetPageTransition();
-  content::PageTransition page_transition_without_qualifier(
-      PageTransitionStripQualifier(page_transition));
+  ui::PageTransition page_transition = location_bar->GetPageTransition();
+  ui::PageTransition page_transition_without_qualifier(
+      ui::PageTransitionStripQualifier(page_transition));
   WindowOpenDisposition open_disposition =
       location_bar->GetWindowOpenDisposition();
   // A PAGE_TRANSITION_TYPED means the user has typed a URL. We do not want to
   // open URLs with instant_controller since in some cases it disregards it
   // and performs a search instead. For example, when using CTRL-Enter, the
   // location_bar is aware of the URL but instant is not.
   // Instant should also not handle PAGE_TRANSITION_RELOAD because its knowledge
   // of the omnibox text may be stale if the user focuses in the omnibox and
   // presses enter without typing anything.
-  if (page_transition_without_qualifier != content::PAGE_TRANSITION_TYPED &&
-      page_transition_without_qualifier != content::PAGE_TRANSITION_RELOAD &&
+  if (page_transition_without_qualifier != ui::PAGE_TRANSITION_TYPED &&
+      page_transition_without_qualifier != ui::PAGE_TRANSITION_RELOAD &&
       browser->instant_controller() &&
       browser->instant_controller()->OpenInstant(open_disposition, url))
     return;
 
   NavigateParams params(browser, url, page_transition);
   params.disposition = open_disposition;
   // Use ADD_INHERIT_OPENER so that all pages opened by the omnibox at least
   // inherit the opener. In some cases the tabstrip will determine the group
   // should be inherited, in which case the group is inherited instead of the
   // opener.
@@ skipping 170 matching lines @@
     new_window->SetBounds(gfx::Rect(new_window->GetRestoredBounds().origin(),
                           browser->window()->GetRestoredBounds().size()));
 
     // We need to show the browser now.  Otherwise ContainerWin assumes the
     // WebContents is invisible and won't size it.
     new_browser->window()->Show();
 
     // The page transition below is only for the purpose of inserting the tab.
     new_browser->tab_strip_model()->AddWebContents(
         contents_dupe, -1,
-        content::PAGE_TRANSITION_LINK,
+        ui::PAGE_TRANSITION_LINK,
         TabStripModel::ADD_ACTIVE);
   }
 
   SessionService* session_service =
       SessionServiceFactory::GetForProfileIfExisting(browser->profile());
   if (session_service)
     session_service->TabRestored(contents_dupe, pinned);
   return contents_dupe;
 }
 
@@ skipping 486 matching lines @@
     BrowserWindow* new_window = b->window();
     new_window->SetBounds(gfx::Rect(new_window->GetRestoredBounds().origin(),
                           browser->window()->GetRestoredBounds().size()));
 
     // We need to show the browser now. Otherwise ContainerWin assumes the
     // WebContents is invisible and won't size it.
     b->window()->Show();
 
     // The page transition below is only for the purpose of inserting the tab.
     b->tab_strip_model()->AddWebContents(view_source_contents, -1,
-                                         content::PAGE_TRANSITION_LINK,
+                                         ui::PAGE_TRANSITION_LINK,
                                          TabStripModel::ADD_ACTIVE);
   }
 
   SessionService* session_service =
       SessionServiceFactory::GetForProfileIfExisting(browser->profile());
   if (session_service)
     session_service->TabRestored(view_source_contents, false);
 }
 
 void ViewSelectedSource(Browser* browser) {
@@ skipping 48 matching lines @@
                                           browser->profile(),
                                           browser->host_desktop_type()));
   app_browser->tab_strip_model()->AppendWebContents(contents, true);
 
   contents->GetMutableRendererPrefs()->can_accept_load_drops = false;
   contents->GetRenderViewHost()->SyncRendererPrefs();
   app_browser->window()->Show();
 }
 
 }  // namespace chrome