Move PageTransition into content namespace. While I'm touching all these files, I've also updated...

chrome/browser/external_tab_container_win.cc

 // Copyright (c) 2011 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/external_tab_container_win.h"
 
 #include <string>
 
 #include "base/debug/trace_event.h"
 #include "base/i18n/rtl.h"
@@ skipping 27 matching lines @@
 #include "chrome/common/render_messages.h"
 #include "chrome/common/url_constants.h"
 #include "content/browser/load_notification_details.h"
 #include "content/browser/renderer_host/render_process_host.h"
 #include "content/browser/renderer_host/render_view_host.h"
 #include "content/browser/renderer_host/resource_dispatcher_host_request_info.h"
 #include "content/browser/tab_contents/navigation_details.h"
 #include "content/browser/tab_contents/provisional_load_details.h"
 #include "content/common/native_web_keyboard_event.h"
 #include "content/common/notification_service.h"
-#include "content/common/page_transition_types.h"
 #include "content/common/page_zoom.h"
 #include "content/common/view_messages.h"
 #include "content/public/common/bindings_policy.h"
+#include "content/public/common/page_transition_types.h"
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/view_prop.h"
 #include "ui/base/models/menu_model.h"
 #include "views/layout/grid_layout.h"
 
 using ui::ViewProp;
 
@@ skipping 44 matching lines @@
     DVLOG(1) << __FUNCTION__;
   }
   virtual ~ExternalTabPageInfoBubbleView() {
     DVLOG(1) << __FUNCTION__;
   }
   // LinkListener methods:
   virtual void LinkClicked(views::Link* source, int event_flags) OVERRIDE {
     GURL url = google_util::AppendGoogleLocaleParam(
         GURL(chrome::kPageInfoHelpCenterURL));
     container_->OpenURLFromTab(container_->tab_contents(), url, GURL(),
-                               NEW_FOREGROUND_TAB, PageTransition::LINK);
+                               NEW_FOREGROUND_TAB,
+                               content::PAGE_TRANSITION_LINK);
   }
  private:
   scoped_refptr<ExternalTabContainer> container_;
 };
 
 base::LazyInstance<ExternalTabContainer::PendingTabs>
     ExternalTabContainer::pending_tabs_(base::LINKER_INITIALIZED);
 
 ExternalTabContainer::ExternalTabContainer(
     AutomationProvider* automation, AutomationResourceMessageFilter* filter)
@@ skipping 230 matching lines @@
 }
 ////////////////////////////////////////////////////////////////////////////////
 // ExternalTabContainer, TabContentsDelegate implementation:
 
 // TODO(adriansc): Remove this method once refactoring changed all call sites.
 TabContents* ExternalTabContainer::OpenURLFromTab(
     TabContents* source,
     const GURL& url,
     const GURL& referrer,
     WindowOpenDisposition disposition,
-    PageTransition::Type transition) {
+    content::PageTransition transition) {
   return OpenURLFromTab(source,
                         OpenURLParams(url, referrer, disposition, transition));
 }
 
 TabContents* ExternalTabContainer::OpenURLFromTab(TabContents* source,
                                                   const OpenURLParams& params) {
   if (pending()) {
     pending_open_url_requests_.push_back(params);
     return NULL;
   }
@@ skipping 12 matching lines @@
                                                     params.referrer,
                                                     params.disposition));
         // TODO(ananta)
         // We should populate other fields in the
         // ViewHostMsg_FrameNavigate_Params structure. Another option could be
         // to refactor the UpdateHistoryForNavigation function in TabContents.
         ViewHostMsg_FrameNavigate_Params nav_params;
         nav_params.referrer = params.referrer;
         nav_params.url = params.url;
         nav_params.page_id = -1;
-        nav_params.transition = PageTransition::LINK;
+        nav_params.transition = content::PAGE_TRANSITION_LINK;
 
         content::LoadCommittedDetails details;
         details.did_replace_entry = false;
 
         scoped_refptr<history::HistoryAddPageArgs> add_page_args(
             tab_contents_->history_tab_helper()->
                 CreateHistoryAddPageArgs(params.url, details, nav_params));
         tab_contents_->history_tab_helper()->
             UpdateHistoryForNavigation(add_page_args);
 
@@ skipping 409 matching lines @@
   if (!automation_)
     return;
 
   static const int kHttpClientErrorStart = 400;
   static const int kHttpServerErrorEnd = 510;
 
   switch (type) {
     case content::NOTIFICATION_LOAD_STOP: {
         const LoadNotificationDetails* load =
             Details<LoadNotificationDetails>(details).ptr();
-        if (load != NULL && PageTransition::IsMainFrame(load->origin())) {
+        if (load != NULL &&
+            content::PageTransitionIsMainFrame(load->origin())) {
           TRACE_EVENT_END_ETW("ExternalTabContainer::Navigate", 0,
                               load->url().spec());
           automation_->Send(new AutomationMsg_TabLoaded(tab_handle_,
                                                         load->url()));
         }
         break;
       }
     case content::NOTIFICATION_NAV_ENTRY_COMMITTED: {
         if (ignore_next_load_notification_) {
           ignore_next_load_notification_ = false;
@@ skipping 226 matching lines @@
 
 void ExternalTabContainer::Navigate(const GURL& url, const GURL& referrer) {
   if (!tab_contents_.get()) {
     NOTREACHED();
     return;
   }
 
   TRACE_EVENT_BEGIN_ETW("ExternalTabContainer::Navigate", 0, url.spec());
 
   tab_contents_->controller().LoadURL(url, referrer,
-                                      PageTransition::START_PAGE,
+                                      content::PAGE_TRANSITION_START_PAGE,
                                       std::string());
 }
 
 bool ExternalTabContainer::OnGoToEntryOffset(int offset) {
   if (load_requests_via_automation_) {
     automation_->Send(new AutomationMsg_RequestGoToHistoryEntryOffset(
         tab_handle_, offset));
     return false;
   }
 
@@ skipping 101 matching lines @@
     AutomationResourceMessageFilter* filter)
     : ExternalTabContainer(automation, filter) {
 }
 
 TemporaryPopupExternalTabContainer::~TemporaryPopupExternalTabContainer() {
   DVLOG(1) << __FUNCTION__;
 }
 
 TabContents* TemporaryPopupExternalTabContainer::OpenURLFromTab(
     TabContents* source, const GURL& url, const GURL& referrer,
-    WindowOpenDisposition disposition, PageTransition::Type transition) {
+    WindowOpenDisposition disposition, content::PageTransition transition) {
   return OpenURLFromTab(source,
                         OpenURLParams(url, referrer, disposition, transition));
 }
 
 TabContents* TemporaryPopupExternalTabContainer::OpenURLFromTab(
     TabContents* source,
     const OpenURLParams& params) {
   if (!automation_)
     return NULL;
 
   OpenURLParams forward_params = params;
   if (params.disposition == CURRENT_TAB) {
     DCHECK(route_all_top_level_navigations_);
     forward_params.disposition = NEW_FOREGROUND_TAB;
   }
   TabContents* new_contents =
       ExternalTabContainer::OpenURLFromTab(source, forward_params);
   // support only one navigation for a dummy tab before it is killed.
   ::DestroyWindow(GetNativeView());
   return new_contents;
 }