WIP for integration between Chrome and Google Web History.

chrome/browser/ui/webui/history_ui.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/history_ui.h"
 
 #include <set>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/i18n/time_formatting.h"
 #include "base/memory/singleton.h"
 #include "base/message_loop.h"
 #include "base/string16.h"
 #include "base/string_number_conversions.h"
 #include "base/string_piece.h"
 #include "base/threading/thread.h"
 #include "base/time.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/bookmarks/bookmark_utils.h"
 #include "chrome/browser/history/history_notifications.h"
 #include "chrome/browser/history/history_types.h"
+#include "chrome/browser/history/web_history_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/webui/chrome_url_data_manager.h"
 #include "chrome/browser/ui/webui/chrome_web_ui_data_source.h"
 #include "chrome/browser/ui/webui/favicon_source.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/time_format.h"
 #include "chrome/common/url_constants.h"
 #include "content/public/browser/notification_details.h"
@@ skipping 142 matching lines @@
                  base::Unretained(this)));
   web_ui()->RegisterMessageCallback("clearBrowsingData",
       base::Bind(&BrowsingHistoryHandler::HandleClearBrowsingData,
                  base::Unretained(this)));
   web_ui()->RegisterMessageCallback("removeBookmark",
       base::Bind(&BrowsingHistoryHandler::HandleRemoveBookmark,
                  base::Unretained(this)));
 }
 
 void BrowsingHistoryHandler::HandleGetHistory(const ListValue* args) {
-  // Anything in-flight is invalid.
-  cancelable_search_consumer_.CancelAllRequests();
-
   // Get arguments (if any).
   int day = 0;
   bool res = ExtractIntegerValue(args, &day);
   DCHECK(res);
 
   // Set our query options.
   history::QueryOptions options;
   options.begin_time = base::Time::Now().LocalMidnight();
   options.begin_time -= base::TimeDelta::FromDays(day);
   options.end_time = base::Time::Now().LocalMidnight();
   options.end_time -= base::TimeDelta::FromDays(day - 1);
 
-  // Need to remember the query string for our results.
-  search_text_ = string16();
-
-  HistoryService* hs =
-      Profile::FromWebUI(web_ui())->GetHistoryService(Profile::EXPLICIT_ACCESS);
-  hs->QueryHistory(search_text_,
-      options,
-      &cancelable_search_consumer_,
-      base::Bind(&BrowsingHistoryHandler::QueryComplete,
-                 base::Unretained(this)));
+  QueryHistory(string16(), options);
 }
 
 void BrowsingHistoryHandler::HandleSearchHistory(const ListValue* args) {
-  // Anything in-flight is invalid.
-  cancelable_search_consumer_.CancelAllRequests();
-
   // Get arguments (if any).
   int month = 0;
   string16 query;
   ExtractSearchHistoryArguments(args, &month, &query);
 
   // Set the query ranges for the given month.
   history::QueryOptions options = CreateMonthQueryOptions(month);
 
   // When searching, limit the number of results returned.
   options.max_count = kMaxSearchResults;
 
+  QueryHistory(query, options);
+}
+
+void BrowsingHistoryHandler::QueryHistory(const string16& text_query,
+    const history::QueryOptions& options) {
+  Profile* profile = Profile::FromWebUI(web_ui());
+
+  // Anything in-flight is invalid.
+  cancelable_search_consumer_.CancelAllRequests();
+
   // Need to remember the query string for our results.
-  search_text_ = query;
-  HistoryService* hs =
-      Profile::FromWebUI(web_ui())->GetHistoryService(Profile::EXPLICIT_ACCESS);
+  search_text_ = text_query;
+
+  HistoryService* hs = profile->GetHistoryService(Profile::EXPLICIT_ACCESS);
   hs->QueryHistory(search_text_,
       options,
       &cancelable_search_consumer_,
       base::Bind(&BrowsingHistoryHandler::QueryComplete,
                  base::Unretained(this)));
+
+  // TODO(dubroy): Should this be moved into the History Service?
+  history::WebHistoryService* web_history =
+      history::WebHistoryService::GetForProfile(profile);
+  if (web_history) {
+    web_history->QueryHistory(
+        search_text_,
+        options,
+        &cancelable_search_consumer_,
+        base::Bind(&BrowsingHistoryHandler::WebHistoryQueryComplete,
+                   base::Unretained(this)));  // FIXME: Probably need a weak ptr here.
+  }
 }
 
 void BrowsingHistoryHandler::HandleRemoveURLsOnOneDay(const ListValue* args) {
   if (cancelable_delete_consumer_.HasPendingRequests()) {
     web_ui()->CallJavascriptFunction("deleteFailed");
     return;
   }
 
   // Get day to delete data from.
   int visit_time = 0;
@@ skipping 99 matching lines @@
     results_value.Append(page_value);
   }
 
   DictionaryValue info_value;
   info_value.SetString("term", search_text_);
   info_value.SetBoolean("finished", results->reached_beginning());
 
   web_ui()->CallJavascriptFunction("historyResult", info_value, results_value);
 }
 
+void BrowsingHistoryHandler::WebHistoryQueryComplete() {
+  LOG(WARNING) << "WebHistoryQueryComplete!";
+}
+
 void BrowsingHistoryHandler::RemoveComplete() {
   urls_to_be_deleted_.clear();
 
   // Notify the page that the deletion request succeeded.
   web_ui()->CallJavascriptFunction("deleteComplete");
 }
 
 void BrowsingHistoryHandler::ExtractSearchHistoryArguments(
     const ListValue* args,
     int* month,
@@ skipping 113 matching lines @@
 const GURL HistoryUI::GetHistoryURLWithSearchText(const string16& text) {
   return GURL(std::string(chrome::kChromeUIHistoryURL) + "#q=" +
               net::EscapeQueryParamValue(UTF16ToUTF8(text), true));
 }
 
 // static
 base::RefCountedMemory* HistoryUI::GetFaviconResourceBytes() {
   return ResourceBundle::GetSharedInstance().
       LoadDataResourceBytes(IDR_HISTORY_FAVICON);
 }