First version of the time slicing on the urls. Not ready for review yet.

chrome/browser/history/visit_database.h

 // 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.
 
 #ifndef CHROME_BROWSER_HISTORY_VISIT_DATABASE_H_
 #define CHROME_BROWSER_HISTORY_VISIT_DATABASE_H_
 #pragma once
 
 #include "base/memory/scoped_ptr.h"
 #include "chrome/browser/history/history_types.h"
 
 namespace sql {
 class Connection;
 class Statement;
 }
 
 namespace history {
 
+class TimeFilter;
+
 // A visit database is one which stores visits for URLs, that is, times and
 // linking information. A visit database must also be a URLDatabase, as this
 // modifies tables used by URLs directly and could be thought of as inheriting
 // from URLDatabase. However, this inheritance is not explicit as things would
 // get too complicated and have multiple inheritance.
 class VisitDatabase {
  public:
   // Must call InitVisitTable() before using to make sure the database is
   // initialized.
   VisitDatabase();
@@ skipping 37 matching lines @@
   // unbounded.
   //
   // If |max_results| is non-zero, up to that many results will be returned. If
   // there are more results than that, the oldest ones will be returned. (This
   // is used for history expiration.)
   //
   // The results will be in increasing order of date.
   bool GetAllVisitsInRange(base::Time begin_time, base::Time end_time,
                            int max_results, VisitVector* visits);
 
+  // Fills all visits in the time ranges embedded in |time_filter| to the given
+  // vector.
+  //
+  // If |max_results| is non-zero, up to that many results will be returned. If
+  // there are more results than that, the oldest ones will be returned. (This
+  // is used for history expiration.)
+  //
+  // The results will be in increasing order of date.
+  bool GetAllVisitsDuringTimes(const TimeFilter& time_filter,
+                               int max_results, VisitVector* visits);
+
   // Fills all visits with specified transition in the time range [begin, end)
   // to the given vector. Either time can be is_null(), in which case the times
   // in that direction are unbounded.
   //
   // If |max_results| is non-zero, up to that many results will be returned. If
   // there are more results than that, the oldest ones will be returned. (This
   // is used for history expiration.)
   //
   // The results will be in increasing order of date.
   bool GetVisitsInRangeForTransition(base::Time begin_time,
@@ skipping 10 matching lines @@
   // Up to |max_count| visits will be returned. If there are more visits than
   // that, the most recent |max_count| will be returned. If 0, all visits in the
   // range will be computed.
   //
   // Only one visit for each URL will be returned, and it will be the most
   // recent one in the time range.
   void GetVisibleVisitsInRange(base::Time begin_time, base::Time end_time,
                                int max_count,
                                VisitVector* visits);
 
+  // Fills all visits in the given time ranges into the given vector that should
+  // be user-visible, which excludes things like redirects and subframes. The
+  // begin time is inclusive, the end time is exclusive.
+  //
+  // Up to |max_count| visits will be returned. If there are more visits than
+  // that, the most recent |max_count| will be returned. If 0, all visits in the
+  // range will be computed.
+  //
+  // Only one visit for each URL will be returned, and it will be the most
+  // recent one in the time range.
+  void GetVisibleVisitsDuringTimes(const TimeFilter& time_filter,
+                                   int max_count,
+                                   VisitVector* visits);
+
   // Returns the visit ID for the most recent visit of the given URL ID, or 0
   // if there is no visit for the URL.
   //
   // If non-NULL, the given visit row will be filled with the information of
   // the found visit. When no visit is found, the row will be unchanged.
   VisitID GetMostRecentVisitForURL(URLID url_id,
                                    VisitRow* visit_row);
 
   // Returns the |max_results| most recent visit sessions for |url_id|.
   //
@@ skipping 60 matching lines @@
  private:
   class VisitAnalysis;
   scoped_ptr<VisitAnalysis> visit_analysis_;
 
   DISALLOW_COPY_AND_ASSIGN(VisitDatabase);
 };
 
 }  // history
 
 #endif  // CHROME_BROWSER_HISTORY_VISIT_DATABASE_H_