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

chrome/browser/history/visit_database.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/history/visit_database.h"
 
 #include <algorithm>
 #include <limits>
 #include <map>
 #include <set>
 
 #include "base/logging.h"
 #include "base/strings/string_number_conversions.h"
 #include "chrome/browser/history/visit_filter.h"
 #include "chrome/common/url_constants.h"
 #include "components/history/core/browser/url_database.h"
-#include "content/public/common/page_transition_types.h"
 #include "sql/statement.h"
+#include "ui/base/page_transition_types.h"
 
 namespace history {
 
 VisitDatabase::VisitDatabase() {
 }
 
 VisitDatabase::~VisitDatabase() {
 }
 
 bool VisitDatabase::InitVisitTable() {
@@ skipping 51 matching lines @@
       GetDB().Execute("DROP TABLE visits");
 }
 
 // Must be in sync with HISTORY_VISIT_ROW_FIELDS.
 // static
 void VisitDatabase::FillVisitRow(sql::Statement& statement, VisitRow* visit) {
   visit->visit_id = statement.ColumnInt64(0);
   visit->url_id = statement.ColumnInt64(1);
   visit->visit_time = base::Time::FromInternalValue(statement.ColumnInt64(2));
   visit->referring_visit = statement.ColumnInt64(3);
-  visit->transition = content::PageTransitionFromInt(statement.ColumnInt(4));
+  visit->transition = ui::PageTransitionFromInt(statement.ColumnInt(4));
   visit->segment_id = statement.ColumnInt64(5);
   visit->visit_duration =
       base::TimeDelta::FromInternalValue(statement.ColumnInt64(6));
 }
 
 // static
 bool VisitDatabase::FillVisitVector(sql::Statement& statement,
                                     VisitVector* visits) {
   if (!statement.is_valid())
     return false;
@@ skipping 163 matching lines @@
       "SELECT" HISTORY_VISIT_ROW_FIELDS
       "FROM visits "
       "WHERE url=? AND visit_time >= ? AND visit_time < ? "
       "AND (transition & ?) != 0 "  // CHAIN_END
       "AND (transition & ?) NOT IN (?, ?, ?) "  // NO SUBFRAME or
                                                 // KEYWORD_GENERATED
       "ORDER BY visit_time DESC"));
   statement.BindInt64(0, url_id);
   statement.BindInt64(1, options.EffectiveBeginTime());
   statement.BindInt64(2, options.EffectiveEndTime());
-  statement.BindInt(3, content::PAGE_TRANSITION_CHAIN_END);
-  statement.BindInt(4, content::PAGE_TRANSITION_CORE_MASK);
-  statement.BindInt(5, content::PAGE_TRANSITION_AUTO_SUBFRAME);
-  statement.BindInt(6, content::PAGE_TRANSITION_MANUAL_SUBFRAME);
-  statement.BindInt(7, content::PAGE_TRANSITION_KEYWORD_GENERATED);
+  statement.BindInt(3, ui::PAGE_TRANSITION_CHAIN_END);
+  statement.BindInt(4, ui::PAGE_TRANSITION_CORE_MASK);
+  statement.BindInt(5, ui::PAGE_TRANSITION_AUTO_SUBFRAME);
+  statement.BindInt(6, ui::PAGE_TRANSITION_MANUAL_SUBFRAME);
+  statement.BindInt(7, ui::PAGE_TRANSITION_KEYWORD_GENERATED);
 
   return FillVisitVectorWithOptions(statement, options, visits);
 }
 
 bool VisitDatabase::GetVisitsForTimes(const std::vector<base::Time>& times,
                                       VisitVector* visits) {
   visits->clear();
 
   for (std::vector<base::Time>::const_iterator it = times.begin();
        it != times.end(); ++it) {
@@ skipping 27 matching lines @@
   statement.BindInt64(2,
       max_results ? max_results : std::numeric_limits<int64>::max());
 
   return FillVisitVector(statement, visits);
 }
 
 bool VisitDatabase::GetVisitsInRangeForTransition(
     base::Time begin_time,
     base::Time end_time,
     int max_results,
-    content::PageTransition transition,
+    ui::PageTransition transition,
     VisitVector* visits) {
   DCHECK(visits);
   visits->clear();
 
   sql::Statement statement(GetDB().GetCachedStatement(SQL_FROM_HERE,
       "SELECT" HISTORY_VISIT_ROW_FIELDS "FROM visits "
       "WHERE visit_time >= ? AND visit_time < ? "
       "AND (transition & ?) == ?"
       "ORDER BY visit_time LIMIT ?"));
 
   // See GetVisibleVisitsInRange for more info on how these times are bound.
   int64 end = end_time.ToInternalValue();
   statement.BindInt64(0, begin_time.ToInternalValue());
   statement.BindInt64(1, end ? end : std::numeric_limits<int64>::max());
-  statement.BindInt(2, content::PAGE_TRANSITION_CORE_MASK);
+  statement.BindInt(2, ui::PAGE_TRANSITION_CORE_MASK);
   statement.BindInt(3, transition);
   statement.BindInt64(4,
       max_results ? max_results : std::numeric_limits<int64>::max());
 
   return FillVisitVector(statement, visits);
 }
 
 bool VisitDatabase::GetVisibleVisitsInRange(const QueryOptions& options,
                                             VisitVector* visits) {
   visits->clear();
   // The visit_time values can be duplicated in a redirect chain, so we sort
   // by id too, to ensure a consistent ordering just in case.
   sql::Statement statement(GetDB().GetCachedStatement(SQL_FROM_HERE,
       "SELECT" HISTORY_VISIT_ROW_FIELDS "FROM visits "
       "WHERE visit_time >= ? AND visit_time < ? "
       "AND (transition & ?) != 0 "  // CHAIN_END
       "AND (transition & ?) NOT IN (?, ?, ?) "  // NO SUBFRAME or
                                                 // KEYWORD_GENERATED
       "ORDER BY visit_time DESC, id DESC"));
 
   statement.BindInt64(0, options.EffectiveBeginTime());
   statement.BindInt64(1, options.EffectiveEndTime());
-  statement.BindInt(2, content::PAGE_TRANSITION_CHAIN_END);
-  statement.BindInt(3, content::PAGE_TRANSITION_CORE_MASK);
-  statement.BindInt(4, content::PAGE_TRANSITION_AUTO_SUBFRAME);
-  statement.BindInt(5, content::PAGE_TRANSITION_MANUAL_SUBFRAME);
-  statement.BindInt(6, content::PAGE_TRANSITION_KEYWORD_GENERATED);
+  statement.BindInt(2, ui::PAGE_TRANSITION_CHAIN_END);
+  statement.BindInt(3, ui::PAGE_TRANSITION_CORE_MASK);
+  statement.BindInt(4, ui::PAGE_TRANSITION_AUTO_SUBFRAME);
+  statement.BindInt(5, ui::PAGE_TRANSITION_MANUAL_SUBFRAME);
+  statement.BindInt(6, ui::PAGE_TRANSITION_KEYWORD_GENERATED);
 
   return FillVisitVectorWithOptions(statement, options, visits);
 }
 
 void VisitDatabase::GetDirectVisitsDuringTimes(const VisitFilter& time_filter,
                                                 int max_results,
                                                 VisitVector* visits) {
   visits->clear();
   if (max_results)
     visits->reserve(max_results);
   for (VisitFilter::TimeVector::const_iterator it = time_filter.times().begin();
        it != time_filter.times().end(); ++it) {
     sql::Statement statement(GetDB().GetCachedStatement(SQL_FROM_HERE,
         "SELECT" HISTORY_VISIT_ROW_FIELDS "FROM visits "
         "WHERE visit_time >= ? AND visit_time < ? "
         "AND (transition & ?) != 0 "  // CHAIN_START
         "AND (transition & ?) IN (?, ?) "  // TYPED or AUTO_BOOKMARK only
         "ORDER BY visit_time DESC, id DESC"));
 
     statement.BindInt64(0, it->first.ToInternalValue());
     statement.BindInt64(1, it->second.ToInternalValue());
-    statement.BindInt(2, content::PAGE_TRANSITION_CHAIN_START);
-    statement.BindInt(3, content::PAGE_TRANSITION_CORE_MASK);
-    statement.BindInt(4, content::PAGE_TRANSITION_TYPED);
-    statement.BindInt(5, content::PAGE_TRANSITION_AUTO_BOOKMARK);
+    statement.BindInt(2, ui::PAGE_TRANSITION_CHAIN_START);
+    statement.BindInt(3, ui::PAGE_TRANSITION_CORE_MASK);
+    statement.BindInt(4, ui::PAGE_TRANSITION_TYPED);
+    statement.BindInt(5, ui::PAGE_TRANSITION_AUTO_BOOKMARK);
 
     while (statement.Step()) {
       VisitRow visit;
       FillVisitRow(statement, &visit);
       visits->push_back(visit);
 
       if (max_results > 0 && static_cast<int>(visits->size()) >= max_results)
         return;
     }
   }
@@ skipping 40 matching lines @@
 
 bool VisitDatabase::GetRedirectFromVisit(VisitID from_visit,
                                          VisitID* to_visit,
                                          GURL* to_url) {
   sql::Statement statement(GetDB().GetCachedStatement(SQL_FROM_HERE,
       "SELECT v.id,u.url "
       "FROM visits v JOIN urls u ON v.url = u.id "
       "WHERE v.from_visit = ? "
       "AND (v.transition & ?) != 0"));  // IS_REDIRECT_MASK
   statement.BindInt64(0, from_visit);
-  statement.BindInt(1, content::PAGE_TRANSITION_IS_REDIRECT_MASK);
+  statement.BindInt(1, ui::PAGE_TRANSITION_IS_REDIRECT_MASK);
 
   if (!statement.Step())
     return false;  // No redirect from this visit. (Or SQL error)
   if (to_visit)
     *to_visit = statement.ColumnInt64(0);
   if (to_url)
     *to_url = GURL(statement.ColumnString(1));
   return true;
 }
 
@@ skipping 44 matching lines @@
   // in the middle of redirect chains, hence the transition checks.
   sql::Statement statement(GetDB().GetCachedStatement(SQL_FROM_HERE,
       "SELECT MIN(v.visit_time), COUNT(*) "
       "FROM visits v INNER JOIN urls u ON v.url = u.id "
       "WHERE u.url >= ? AND u.url < ? "
       "AND (transition & ?) != 0 "
       "AND (transition & ?) NOT IN (?, ?, ?)"));
   statement.BindString(0, host_query_min);
   statement.BindString(1,
       host_query_min.substr(0, host_query_min.size() - 1) + '0');
-  statement.BindInt(2, content::PAGE_TRANSITION_CHAIN_END);
-  statement.BindInt(3, content::PAGE_TRANSITION_CORE_MASK);
-  statement.BindInt(4, content::PAGE_TRANSITION_AUTO_SUBFRAME);
-  statement.BindInt(5, content::PAGE_TRANSITION_MANUAL_SUBFRAME);
-  statement.BindInt(6, content::PAGE_TRANSITION_KEYWORD_GENERATED);
+  statement.BindInt(2, ui::PAGE_TRANSITION_CHAIN_END);
+  statement.BindInt(3, ui::PAGE_TRANSITION_CORE_MASK);
+  statement.BindInt(4, ui::PAGE_TRANSITION_AUTO_SUBFRAME);
+  statement.BindInt(5, ui::PAGE_TRANSITION_MANUAL_SUBFRAME);
+  statement.BindInt(6, ui::PAGE_TRANSITION_KEYWORD_GENERATED);
 
   if (!statement.Step()) {
     // We've never been to this page before.
     *count = 0;
     return true;
   }
 
   if (!statement.Succeeded())
     return false;
 
@@ skipping 76 matching lines @@
 
   statement.BindInt64(0, max_visits);
 
   if (!statement.is_valid())
     return;
 
   while (statement.Step()) {
     BriefVisitInfo info;
     info.url_id = statement.ColumnInt64(0);
     info.time = base::Time::FromInternalValue(statement.ColumnInt64(1));
-    info.transition = content::PageTransitionFromInt(statement.ColumnInt(2));
+    info.transition = ui::PageTransitionFromInt(statement.ColumnInt(2));
     result_vector->push_back(info);
   }
 }
 
 }  // namespace history