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

chrome/browser/ui/sync/one_click_signin_helper.cc

 // Copyright (c) 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/sync/one_click_signin_helper.h"
 
 #include <algorithm>
 #include <functional>
 #include <utility>
 #include <vector>
@@ skipping 61 matching lines @@
 #include "components/signin/core/common/profile_management_switches.h"
 #include "components/sync_driver/sync_prefs.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/page_navigator.h"
 #include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_delegate.h"
 #include "content/public/common/frame_navigate_params.h"
-#include "content/public/common/page_transition_types.h"
 #include "google_apis/gaia/gaia_auth_util.h"
 #include "google_apis/gaia/gaia_urls.h"
 #include "grit/components_strings.h"
 #include "ipc/ipc_message_macros.h"
 #include "net/base/url_util.h"
 #include "net/cookies/cookie_monster.h"
 #include "net/url_request/url_request.h"
 #include "ui/base/l10n/l10n_util.h"
+#include "ui/base/page_transition_types.h"
 #include "url/gurl.h"
 
 
 namespace {
 
 // ConfirmEmailDialogDelegate -------------------------------------------------
 
 class ConfirmEmailDialogDelegate : public TabModalConfirmDialogDelegate {
  public:
   enum Action {
@@ skipping 101 matching lines @@
 void ConfirmEmailDialogDelegate::OnClosed() {
   base::ResetAndReturn(&callback_).Run(CLOSE);
 }
 
 void ConfirmEmailDialogDelegate::OnLinkClicked(
     WindowOpenDisposition disposition) {
   content::OpenURLParams params(
       GURL(chrome::kChromeSyncMergeTroubleshootingURL),
       content::Referrer(),
       NEW_POPUP,
-      content::PAGE_TRANSITION_AUTO_TOPLEVEL,
+      ui::PAGE_TRANSITION_AUTO_TOPLEVEL,
       false);
   // It is guaranteed that |web_contents_| is valid here because when it's
   // deleted, the dialog is immediately closed and no further action can be
   // performed.
   web_contents_->OpenURL(params);
 }
 
 
 // Helpers --------------------------------------------------------------------
 
@@ skipping 213 matching lines @@
 class CurrentHistoryCleaner : public content::WebContentsObserver {
  public:
   explicit CurrentHistoryCleaner(content::WebContents* contents);
   virtual ~CurrentHistoryCleaner();
 
   // content::WebContentsObserver:
   virtual void WebContentsDestroyed() OVERRIDE;
   virtual void DidCommitProvisionalLoadForFrame(
       content::RenderFrameHost* render_frame_host,
       const GURL& url,
-      content::PageTransition transition_type) OVERRIDE;
+      ui::PageTransition transition_type) OVERRIDE;
 
  private:
   scoped_ptr<content::WebContents> contents_;
   int history_index_to_remove_;
 
   DISALLOW_COPY_AND_ASSIGN(CurrentHistoryCleaner);
 };
 
 CurrentHistoryCleaner::CurrentHistoryCleaner(content::WebContents* contents)
     : WebContentsObserver(contents) {
   history_index_to_remove_ =
       web_contents()->GetController().GetLastCommittedEntryIndex();
 }
 
 CurrentHistoryCleaner::~CurrentHistoryCleaner() {
 }
 
 void CurrentHistoryCleaner::DidCommitProvisionalLoadForFrame(
     content::RenderFrameHost* render_frame_host,
     const GURL& url,
-    content::PageTransition transition_type) {
+    ui::PageTransition transition_type) {
   // Return early if this is not top-level navigation.
   if (render_frame_host->GetParent())
     return;
 
   content::NavigationController* nc = &web_contents()->GetController();
   HistoryService* hs = HistoryServiceFactory::GetForProfile(
       Profile::FromBrowserContext(web_contents()->GetBrowserContext()),
       Profile::IMPLICIT_ACCESS);
 
   // Have to wait until something else gets added to history before removal.
@@ skipping 719 matching lines @@
   if (contents->GetController().GetPendingEntry())
     return;
 
   VLOG(1) << "RedirectToNtpOrAppsPage";
   // Redirect to NTP/Apps page and display a confirmation bubble
   GURL url(source == signin::SOURCE_APPS_PAGE_LINK ?
            chrome::kChromeUIAppsURL : chrome::kChromeUINewTabURL);
   content::OpenURLParams params(url,
                                 content::Referrer(),
                                 CURRENT_TAB,
-                                content::PAGE_TRANSITION_AUTO_TOPLEVEL,
+                                ui::PAGE_TRANSITION_AUTO_TOPLEVEL,
                                 false);
   contents->OpenURL(params);
 }
 
 // static
 void OneClickSigninHelper::RedirectToNtpOrAppsPageIfNecessary(
     content::WebContents* contents, signin::Source source) {
   if (source != signin::SOURCE_SETTINGS &&
       source != signin::SOURCE_WEBSTORE_INSTALL) {
     RedirectToNtpOrAppsPage(contents, source);
   }
 }
 
 void OneClickSigninHelper::RedirectToSignin() {
   VLOG(1) << "OneClickSigninHelper::RedirectToSignin";
 
   // Extract the existing sounce=X value.  Default to "2" if missing.
   signin::Source source = signin::GetSourceForPromoURL(continue_url_);
   if (source == signin::SOURCE_UNKNOWN)
     source = signin::SOURCE_MENU;
   GURL page = signin::GetPromoURL(source, false);
 
   content::WebContents* contents = web_contents();
   contents->GetController().LoadURL(page,
                                     content::Referrer(),
-                                    content::PAGE_TRANSITION_AUTO_TOPLEVEL,
+                                    ui::PAGE_TRANSITION_AUTO_TOPLEVEL,
                                     std::string());
 }
 
 void OneClickSigninHelper::CleanTransientState() {
   VLOG(1) << "OneClickSigninHelper::CleanTransientState";
   showing_signin_ = false;
   email_.clear();
   password_.clear();
   auto_accept_ = AUTO_ACCEPT_NONE;
   source_ = signin::SOURCE_UNKNOWN;
@@ skipping 63 matching lines @@
         Profile::FromBrowserContext(web_contents()->GetBrowserContext());
     SigninClient* signin_client =
         profile ? ChromeSigninClientFactory::GetForProfile(profile) : NULL;
     int process_id = web_contents()->GetRenderProcessHost()->GetID();
     if (signin_client && signin_client->IsSigninProcess(process_id))
       signin_client->ClearSigninProcess();
 
     // If the navigation to a non-sign-in URL hasn't been triggered by the web
     // contents, the sign in flow has been aborted and the state must be
     // cleaned (crbug.com/269421).
-    if (!content::PageTransitionIsWebTriggerable(params.transition) &&
+    if (!ui::PageTransitionIsWebTriggerable(params.transition) &&
         auto_accept_ != AUTO_ACCEPT_NONE) {
       CleanTransientState();
     }
   }
 }
 
 void OneClickSigninHelper::DidStopLoading(
     content::RenderViewHost* render_view_host) {
   // If the user left the sign in process, clear all members.
   // TODO(rogerta): might need to allow some youtube URLs.
@@ skipping 269 matching lines @@
     // If the web contents is showing a blank page and not about to be closed,
     // redirect to the NTP or apps page.
     if (signin::IsContinueUrlForWebBasedSigninFlow(current_url) &&
         !signin::IsAutoCloseEnabledInURL(original_continue_url_)) {
       RedirectToNtpOrAppsPage(
           web_contents(),
           signin::GetSourceForPromoURL(original_continue_url_));
     }
   }
 }