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

components/sessions/serialized_navigation_entry.cc

 // Copyright 2013 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 "components/sessions/serialized_navigation_entry.h"
 
 #include "base/pickle.h"
 #include "base/strings/utf_string_conversions.h"
 #include "content/public/browser/favicon_status.h"
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/navigation_entry.h"
 #include "sync/protocol/session_specifics.pb.h"
 #include "sync/util/time.h"
 #include "third_party/WebKit/public/platform/WebReferrerPolicy.h"
 
 using content::NavigationEntry;
 
 namespace sessions {
 
 const char kSearchTermsKey[] = "search_terms";
 
 SerializedNavigationEntry::SerializedNavigationEntry()
     : index_(-1),
       unique_id_(0),
-      transition_type_(content::PAGE_TRANSITION_TYPED),
+      transition_type_(ui::PAGE_TRANSITION_TYPED),
       has_post_data_(false),
       post_id_(-1),
       is_overriding_user_agent_(false),
       http_status_code_(0),
       is_restored_(false),
       blocked_state_(STATE_INVALID) {}
 
 SerializedNavigationEntry::~SerializedNavigationEntry() {}
 
 // static
@@ skipping 37 matching lines @@
       static_cast<blink::WebReferrerPolicy>(sync_data.referrer_policy()));
   navigation.virtual_url_ = GURL(sync_data.virtual_url());
   navigation.title_ = base::UTF8ToUTF16(sync_data.title());
   navigation.page_state_ =
       content::PageState::CreateFromEncodedData(sync_data.state());
 
   uint32 transition = 0;
   if (sync_data.has_page_transition()) {
     switch (sync_data.page_transition()) {
       case sync_pb::SyncEnums_PageTransition_LINK:
-        transition = content::PAGE_TRANSITION_LINK;
+        transition = ui::PAGE_TRANSITION_LINK;
         break;
       case sync_pb::SyncEnums_PageTransition_TYPED:
-        transition = content::PAGE_TRANSITION_TYPED;
+        transition = ui::PAGE_TRANSITION_TYPED;
         break;
       case sync_pb::SyncEnums_PageTransition_AUTO_BOOKMARK:
-        transition = content::PAGE_TRANSITION_AUTO_BOOKMARK;
+        transition = ui::PAGE_TRANSITION_AUTO_BOOKMARK;
         break;
       case sync_pb::SyncEnums_PageTransition_AUTO_SUBFRAME:
-        transition = content::PAGE_TRANSITION_AUTO_SUBFRAME;
+        transition = ui::PAGE_TRANSITION_AUTO_SUBFRAME;
         break;
       case sync_pb::SyncEnums_PageTransition_MANUAL_SUBFRAME:
-        transition = content::PAGE_TRANSITION_MANUAL_SUBFRAME;
+        transition = ui::PAGE_TRANSITION_MANUAL_SUBFRAME;
         break;
       case sync_pb::SyncEnums_PageTransition_GENERATED:
-        transition = content::PAGE_TRANSITION_GENERATED;
+        transition = ui::PAGE_TRANSITION_GENERATED;
         break;
       case sync_pb::SyncEnums_PageTransition_AUTO_TOPLEVEL:
-        transition = content::PAGE_TRANSITION_AUTO_TOPLEVEL;
+        transition = ui::PAGE_TRANSITION_AUTO_TOPLEVEL;
         break;
       case sync_pb::SyncEnums_PageTransition_FORM_SUBMIT:
-        transition = content::PAGE_TRANSITION_FORM_SUBMIT;
+        transition = ui::PAGE_TRANSITION_FORM_SUBMIT;
         break;
       case sync_pb::SyncEnums_PageTransition_RELOAD:
-        transition = content::PAGE_TRANSITION_RELOAD;
+        transition = ui::PAGE_TRANSITION_RELOAD;
         break;
       case sync_pb::SyncEnums_PageTransition_KEYWORD:
-        transition = content::PAGE_TRANSITION_KEYWORD;
+        transition = ui::PAGE_TRANSITION_KEYWORD;
         break;
       case sync_pb::SyncEnums_PageTransition_KEYWORD_GENERATED:
-        transition =
-            content::PAGE_TRANSITION_KEYWORD_GENERATED;
+        transition = ui::PAGE_TRANSITION_KEYWORD_GENERATED;
         break;
       default:
-        transition = content::PAGE_TRANSITION_LINK;
+        transition = ui::PAGE_TRANSITION_LINK;
         break;
     }
   }
 
   if  (sync_data.has_redirect_type()) {
     switch (sync_data.redirect_type()) {
       case sync_pb::SyncEnums_PageTransitionRedirectType_CLIENT_REDIRECT:
-        transition |= content::PAGE_TRANSITION_CLIENT_REDIRECT;
+        transition |= ui::PAGE_TRANSITION_CLIENT_REDIRECT;
         break;
       case sync_pb::SyncEnums_PageTransitionRedirectType_SERVER_REDIRECT:
-        transition |= content::PAGE_TRANSITION_SERVER_REDIRECT;
+        transition |= ui::PAGE_TRANSITION_SERVER_REDIRECT;
         break;
     }
   }
   if (sync_data.navigation_forward_back())
-      transition |= content::PAGE_TRANSITION_FORWARD_BACK;
+      transition |= ui::PAGE_TRANSITION_FORWARD_BACK;
   if (sync_data.navigation_from_address_bar())
-      transition |= content::PAGE_TRANSITION_FROM_ADDRESS_BAR;
+      transition |= ui::PAGE_TRANSITION_FROM_ADDRESS_BAR;
   if (sync_data.navigation_home_page())
-      transition |= content::PAGE_TRANSITION_HOME_PAGE;
+      transition |= ui::PAGE_TRANSITION_HOME_PAGE;
   if (sync_data.navigation_chain_start())
-      transition |= content::PAGE_TRANSITION_CHAIN_START;
+      transition |= ui::PAGE_TRANSITION_CHAIN_START;
   if (sync_data.navigation_chain_end())
-      transition |= content::PAGE_TRANSITION_CHAIN_END;
+      transition |= ui::PAGE_TRANSITION_CHAIN_END;
 
-  navigation.transition_type_ =
-      static_cast<content::PageTransition>(transition);
+  navigation.transition_type_ = static_cast<ui::PageTransition>(transition);
 
   navigation.timestamp_ = base::Time();
   navigation.search_terms_ = base::UTF8ToUTF16(sync_data.search_terms());
   if (sync_data.has_favicon_url())
     navigation.favicon_url_ = GURL(sync_data.favicon_url());
 
   navigation.http_status_code_ = sync_data.http_status_code();
 
   navigation.Sanitize();
 
@@ skipping 117 matching lines @@
   std::string virtual_url_spec, page_state_data;
   int transition_type_int = 0;
   if (!iterator->ReadInt(&index_) ||
       !iterator->ReadString(&virtual_url_spec) ||
       !iterator->ReadString16(&title_) ||
       !iterator->ReadString(&page_state_data) ||
       !iterator->ReadInt(&transition_type_int))
     return false;
   virtual_url_ = GURL(virtual_url_spec);
   page_state_ = content::PageState::CreateFromEncodedData(page_state_data);
-  transition_type_ = static_cast<content::PageTransition>(transition_type_int);
+  transition_type_ = ui::PageTransitionFromInt(transition_type_int);
 
   // type_mask did not always exist in the written stream. As such, we
   // don't fail if it can't be read.
   int type_mask = 0;
   bool has_type_mask = iterator->ReadInt(&type_mask);
 
   if (has_type_mask) {
     has_post_data_ = type_mask & HAS_POST_DATA;
     // the "referrer" property was added after type_mask to the written
     // stream. As such, we don't fail if it can't be read.
@@ skipping 44 matching lines @@
 
 scoped_ptr<NavigationEntry> SerializedNavigationEntry::ToNavigationEntry(
     int page_id,
     content::BrowserContext* browser_context) const {
   scoped_ptr<NavigationEntry> entry(
       content::NavigationController::CreateNavigationEntry(
           virtual_url_,
           referrer_,
           // Use a transition type of reload so that we don't incorrectly
           // increase the typed count.
-          content::PAGE_TRANSITION_RELOAD,
+          ui::PAGE_TRANSITION_RELOAD,
           false,
           // The extra headers are not sync'ed across sessions.
           std::string(),
           browser_context));
 
   entry->SetTitle(title_);
   entry->SetPageState(page_state_);
   entry->SetPageID(page_id);
   entry->SetHasPostData(has_post_data_);
   entry->SetPostID(post_id_);
@@ skipping 14 matching lines @@
 // TODO(zea): perhaps sync state (scroll position, form entries, etc.) as well?
 // See http://crbug.com/67068.
 sync_pb::TabNavigation SerializedNavigationEntry::ToSyncData() const {
   sync_pb::TabNavigation sync_data;
   sync_data.set_virtual_url(virtual_url_.spec());
   sync_data.set_referrer(referrer_.url.spec());
   sync_data.set_referrer_policy(referrer_.policy);
   sync_data.set_title(base::UTF16ToUTF8(title_));
 
   // Page transition core.
-  COMPILE_ASSERT(content::PAGE_TRANSITION_LAST_CORE ==
-                 content::PAGE_TRANSITION_KEYWORD_GENERATED,
+  COMPILE_ASSERT(ui::PAGE_TRANSITION_LAST_CORE ==
+                 ui::PAGE_TRANSITION_KEYWORD_GENERATED,
                  PageTransitionCoreBounds);
-  switch (PageTransitionStripQualifier(transition_type_)) {
-    case content::PAGE_TRANSITION_LINK:
+  switch (ui::PageTransitionStripQualifier(transition_type_)) {
+    case ui::PAGE_TRANSITION_LINK:
       sync_data.set_page_transition(
           sync_pb::SyncEnums_PageTransition_LINK);
       break;
-    case content::PAGE_TRANSITION_TYPED:
+    case ui::PAGE_TRANSITION_TYPED:
       sync_data.set_page_transition(
           sync_pb::SyncEnums_PageTransition_TYPED);
       break;
-    case content::PAGE_TRANSITION_AUTO_BOOKMARK:
+    case ui::PAGE_TRANSITION_AUTO_BOOKMARK:
       sync_data.set_page_transition(
           sync_pb::SyncEnums_PageTransition_AUTO_BOOKMARK);
       break;
-    case content::PAGE_TRANSITION_AUTO_SUBFRAME:
+    case ui::PAGE_TRANSITION_AUTO_SUBFRAME:
       sync_data.set_page_transition(
         sync_pb::SyncEnums_PageTransition_AUTO_SUBFRAME);
       break;
-    case content::PAGE_TRANSITION_MANUAL_SUBFRAME:
+    case ui::PAGE_TRANSITION_MANUAL_SUBFRAME:
       sync_data.set_page_transition(
         sync_pb::SyncEnums_PageTransition_MANUAL_SUBFRAME);
       break;
-    case content::PAGE_TRANSITION_GENERATED:
+    case ui::PAGE_TRANSITION_GENERATED:
       sync_data.set_page_transition(
         sync_pb::SyncEnums_PageTransition_GENERATED);
       break;
-    case content::PAGE_TRANSITION_AUTO_TOPLEVEL:
+    case ui::PAGE_TRANSITION_AUTO_TOPLEVEL:
       sync_data.set_page_transition(
         sync_pb::SyncEnums_PageTransition_AUTO_TOPLEVEL);
       break;
-    case content::PAGE_TRANSITION_FORM_SUBMIT:
+    case ui::PAGE_TRANSITION_FORM_SUBMIT:
       sync_data.set_page_transition(
         sync_pb::SyncEnums_PageTransition_FORM_SUBMIT);
       break;
-    case content::PAGE_TRANSITION_RELOAD:
+    case ui::PAGE_TRANSITION_RELOAD:
       sync_data.set_page_transition(
         sync_pb::SyncEnums_PageTransition_RELOAD);
       break;
-    case content::PAGE_TRANSITION_KEYWORD:
+    case ui::PAGE_TRANSITION_KEYWORD:
       sync_data.set_page_transition(
         sync_pb::SyncEnums_PageTransition_KEYWORD);
       break;
-    case content::PAGE_TRANSITION_KEYWORD_GENERATED:
+    case ui::PAGE_TRANSITION_KEYWORD_GENERATED:
       sync_data.set_page_transition(
         sync_pb::SyncEnums_PageTransition_KEYWORD_GENERATED);
       break;
     default:
       NOTREACHED();
   }
 
   // Page transition qualifiers.
-  if (PageTransitionIsRedirect(transition_type_)) {
-    if (transition_type_ & content::PAGE_TRANSITION_CLIENT_REDIRECT) {
+  if (ui::PageTransitionIsRedirect(transition_type_)) {
+    if (transition_type_ & ui::PAGE_TRANSITION_CLIENT_REDIRECT) {
       sync_data.set_redirect_type(
         sync_pb::SyncEnums_PageTransitionRedirectType_CLIENT_REDIRECT);
-    } else if (transition_type_ & content::PAGE_TRANSITION_SERVER_REDIRECT) {
+    } else if (transition_type_ & ui::PAGE_TRANSITION_SERVER_REDIRECT) {
       sync_data.set_redirect_type(
         sync_pb::SyncEnums_PageTransitionRedirectType_SERVER_REDIRECT);
     }
   }
   sync_data.set_navigation_forward_back(
-      (transition_type_ & content::PAGE_TRANSITION_FORWARD_BACK) != 0);
+      (transition_type_ & ui::PAGE_TRANSITION_FORWARD_BACK) != 0);
   sync_data.set_navigation_from_address_bar(
-      (transition_type_ & content::PAGE_TRANSITION_FROM_ADDRESS_BAR) != 0);
+      (transition_type_ & ui::PAGE_TRANSITION_FROM_ADDRESS_BAR) != 0);
   sync_data.set_navigation_home_page(
-      (transition_type_ & content::PAGE_TRANSITION_HOME_PAGE) != 0);
+      (transition_type_ & ui::PAGE_TRANSITION_HOME_PAGE) != 0);
   sync_data.set_navigation_chain_start(
-      (transition_type_ & content::PAGE_TRANSITION_CHAIN_START) != 0);
+      (transition_type_ & ui::PAGE_TRANSITION_CHAIN_START) != 0);
   sync_data.set_navigation_chain_end(
-      (transition_type_ & content::PAGE_TRANSITION_CHAIN_END) != 0);
+      (transition_type_ & ui::PAGE_TRANSITION_CHAIN_END) != 0);
 
   sync_data.set_unique_id(unique_id_);
   sync_data.set_timestamp_msec(syncer::TimeToProtoTime(timestamp_));
   // The full-resolution timestamp works as a global ID.
   sync_data.set_global_id(timestamp_.ToInternalValue());
 
   sync_data.set_search_terms(base::UTF16ToUTF8(search_terms_));
 
   sync_data.set_http_status_code(http_status_code_);
 
@@ skipping 54 matching lines @@
   // No need to compare the policy, as it doesn't change during
   // sanitization. If there has been a change, the referrer needs to be
   // stripped from the page state as well.
   if (referrer_.url != new_referrer.url) {
     referrer_ = content::Referrer();
     page_state_ = page_state_.RemoveReferrer();
   }
 }
 
 }  // namespace sessions