Support for different weight-functions for time-slicing.

chrome/browser/ui/webui/ntp/suggestions_page_handler.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/webui/ntp/suggestions_page_handler.h"
 
 #include <set>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
+#include "base/command_line.h"
 #include "base/md5.h"
 #include "base/memory/scoped_vector.h"
 #include "base/memory/singleton.h"
 #include "base/metrics/histogram.h"
 #include "base/string16.h"
 #include "base/string_number_conversions.h"
 #include "base/threading/thread.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/history/page_usage_data.h"
 #include "chrome/browser/history/top_sites.h"
 #include "chrome/browser/history/visit_filter.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/webui/chrome_url_data_manager.h"
 #include "chrome/browser/ui/webui/favicon_source.h"
 #include "chrome/browser/ui/webui/ntp/new_tab_ui.h"
 #include "chrome/browser/ui/webui/ntp/ntp_stats.h"
 #include "chrome/browser/ui/webui/ntp/thumbnail_source.h"
 #include "chrome/common/chrome_notification_types.h"
+#include "chrome/common/chrome_switches.h"
 #include "chrome/common/url_constants.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/notification_source.h"
 #include "content/public/browser/user_metrics.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_ui.h"
 #include "content/public/common/page_transition_types.h"
 #include "googleurl/src/gurl.h"
@@ skipping 90 matching lines @@
     pages_value_.reset();
   }
 }
 
 void SuggestionsHandler::StartQueryForSuggestions() {
   HistoryService* history =
       Profile::FromWebUI(web_ui())->GetHistoryService(Profile::EXPLICIT_ACCESS);
   // |history| may be null during unit tests.
   if (history) {
     history::VisitFilter time_filter;
-    base::TimeDelta half_an_hour =
-       base::TimeDelta::FromMicroseconds(base::Time::kMicrosecondsPerHour / 2);
-    base::Time now = base::Time::Now();
-    time_filter.SetTimeInRangeFilter(now - half_an_hour, now + half_an_hour);
-    history->QueryFilteredURLs(0, time_filter, &history_consumer_,
+

[Evan Stade, 2012/05/03 00:06:57]

remove \n

[Rune Fevang, 2012/05/03 20:50:59]

Done.

+    time_filter.SetFilterTime(base::Time::Now());
+

[Evan Stade, 2012/05/03 00:06:57]

remove \n

[Rune Fevang, 2012/05/03 20:50:59]

Done.

+    time_filter.SetFilterWidth(GetFilterWidth());
+    time_filter.set_sorting_order(GetSortingOrder());
+
+    history->QueryFilteredURLs(
+        0, time_filter, &history_consumer_,
         base::Bind(&SuggestionsHandler::OnSuggestionsURLsAvailable,
                    base::Unretained(this)));
   }
 }
 
 void SuggestionsHandler::HandleBlacklistURL(const ListValue* args) {
   std::string url = UTF16ToUTF8(ExtractStringValue(args));
   BlacklistURL(GURL(url));
 }
 
@@ skipping 65 matching lines @@
 }
 
 std::string SuggestionsHandler::GetDictionaryKeyForURL(const std::string& url) {
   return base::MD5String(url);
 }
 
 // static
 void SuggestionsHandler::RegisterUserPrefs(PrefService* prefs) {
   // TODO(georgey) add user preferences (such as own blacklist) as needed.
 }
+
+// static
+base::TimeDelta SuggestionsHandler::GetFilterWidth() {
+  const CommandLine* cli = CommandLine::ForCurrentProcess();
+  const std::string filter_width_switch =
+      cli->GetSwitchValueASCII(switches::kSuggestionNtpFilterWidth);
+  unsigned int filter_width;
+  if (base::StringToUint(filter_width_switch, &filter_width)) {

[Evan Stade, 2012/05/03 00:06:57]

no curlies

[Rune Fevang, 2012/05/03 20:50:59]

Done.

+    return base::TimeDelta::FromMinutes(filter_width);
+  }
+  return base::TimeDelta::FromHours(1);
+}
+
+// static
+history::VisitFilter::SortingOrder SuggestionsHandler::GetSortingOrder() {
+  const CommandLine* cli = CommandLine::ForCurrentProcess();
+  if (cli->HasSwitch(switches::kSuggestionNtpGaussianFilter))
+    return history::VisitFilter::ORDER_BY_TIME_GAUSSIAN;
+  if (cli->HasSwitch(switches::kSuggestionNtpLinearFilter))
+    return history::VisitFilter::ORDER_BY_TIME_LINEAR;
+  return history::VisitFilter::ORDER_BY_RECENCY;
+}
+

[Evan Stade, 2012/05/03 00:06:57]

remove \n

[Rune Fevang, 2012/05/03 20:50:59]

Done.