WIP for integration between Chrome and Google Web History.

chrome/browser/ui/webui/history_ui.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_UI_WEBUI_HISTORY_UI_H_
 #define CHROME_BROWSER_UI_WEBUI_HISTORY_UI_H_
 #pragma once
 
 #include <string>
 
 #include "base/string16.h"
 #include "chrome/browser/cancelable_request.h"
 #include "chrome/browser/history/history.h"
+#include "chrome/browser/history/web_history_service.h"
 #include "chrome/browser/ui/webui/chrome_url_data_manager.h"
 #include "content/public/browser/notification_registrar.h"
 #include "content/public/browser/web_ui_controller.h"
 #include "content/public/browser/web_ui_message_handler.h"
 
 // The handler for Javascript messages related to the "history" view.
 class BrowsingHistoryHandler : public content::WebUIMessageHandler,
                                public content::NotificationObserver {
  public:
   BrowsingHistoryHandler();
@@ skipping 16 matching lines @@
 
   // Handler for "removeBookmark" message.
   void HandleRemoveBookmark(const base::ListValue* args);
 
   // content::NotificationObserver implementation.
   virtual void Observe(int type,
                        const content::NotificationSource& source,
                        const content::NotificationDetails& details) OVERRIDE;
 
  private:
+  // Helper used by handlers getHistory and searchHistory.
+  void QueryHistory(const string16& text_query,
+                    const history::QueryOptions& options);
+
   // Callback from the history system when the history list is available.
   void QueryComplete(HistoryService::Handle request_handle,
                      history::QueryResults* results);
 
+  // Callback from the WebHistory service with results from Web History.
+  void WebHistoryQueryComplete();
+
   // Callback from the history system when visits were deleted.
   void RemoveComplete();
 
   // Extract the arguments from the call to HandleSearchHistory.
   void ExtractSearchHistoryArguments(const base::ListValue* args,
                                      int* month,
                                      string16* query);
 
   // Figure out the query options for a month-wide query.
   history::QueryOptions CreateMonthQueryOptions(int month);
@@ skipping 22 matching lines @@
   // Return the URL for a given search term.
   static const GURL GetHistoryURLWithSearchText(const string16& text);
 
   static base::RefCountedMemory* GetFaviconResourceBytes();
 
  private:
   DISALLOW_COPY_AND_ASSIGN(HistoryUI);
 };
 
 #endif  // CHROME_BROWSER_UI_WEBUI_HISTORY_UI_H_