Remove old history UI, and replace with history2.

chrome/browser/ui/webui/history_ui.cc

 // Copyright (c) 2011 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 <algorithm>
 #include <set>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/callback_old.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/history/history_notifications.h"
 #include "chrome/browser/history/history_types.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_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/browser/tab_contents/tab_contents.h"
 #include "content/browser/tab_contents/tab_contents_delegate.h"
 #include "content/browser/user_metrics.h"
+#include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_source.h"
 #include "grit/browser_resources.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
 #include "grit/theme_resources.h"
 #include "grit/theme_resources_standard.h"
 #include "net/base/escape.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
@@ skipping 20 matching lines @@
                                 int request_id) OVERRIDE;
 
   virtual std::string GetMimeType(const std::string& path) const OVERRIDE;
 
  private:
   ~HistoryUIHTMLSource();
 
   DISALLOW_COPY_AND_ASSIGN(HistoryUIHTMLSource);
 };
 
-
 HistoryUIHTMLSource::HistoryUIHTMLSource()
     : ChromeWebUIDataSource(chrome::kChromeUIHistoryHost) {
   AddLocalizedString("loading", IDS_HISTORY_LOADING);
   AddLocalizedString("title", IDS_HISTORY_TITLE);
   AddLocalizedString("newest", IDS_HISTORY_NEWEST);
-  AddLocalizedString("newer",  IDS_HISTORY_NEWER);
+  AddLocalizedString("newer", IDS_HISTORY_NEWER);
   AddLocalizedString("older", IDS_HISTORY_OLDER);
   AddLocalizedString("searchresultsfor", IDS_HISTORY_SEARCHRESULTSFOR);
   AddLocalizedString("history", IDS_HISTORY_BROWSERESULTS);
   AddLocalizedString("cont", IDS_HISTORY_CONTINUED);
   AddLocalizedString("searchbutton", IDS_HISTORY_SEARCH_BUTTON);
   AddLocalizedString("noresults", IDS_HISTORY_NO_RESULTS);
   AddLocalizedString("noitems", IDS_HISTORY_NO_ITEMS);
   AddLocalizedString("edithistory", IDS_HISTORY_START_EDITING_HISTORY);
   AddLocalizedString("doneediting", IDS_HISTORY_STOP_EDITING_HISTORY);
   AddLocalizedString("removeselected", IDS_HISTORY_REMOVE_SELECTED_ITEMS);
   AddLocalizedString("clearallhistory",
                      IDS_HISTORY_OPEN_CLEAR_BROWSING_DATA_DIALOG);
   AddLocalizedString("deletewarning",
                      IDS_HISTORY_DELETE_PRIOR_VISITS_WARNING);
+  AddLocalizedString("actionMenuDescription",
+                     IDS_HISTORY_ACTION_MENU_DESCRIPTION);
+  AddLocalizedString("removeFromHistory", IDS_HISTORY_REMOVE_PAGE);
+  AddLocalizedString("moreFromSite", IDS_HISTORY_MORE_FROM_SITE);
 }
 
 HistoryUIHTMLSource::~HistoryUIHTMLSource() {
 }
 
 void HistoryUIHTMLSource::StartDataRequest(const std::string& path,
                                            bool is_incognito,
                                            int request_id) {
   if (path == kStringsJsFile) {
     SendLocalizedStringsAsJSON(request_id);
@@ skipping 105 matching lines @@
 }
 
 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;
-  ExtractIntegerValue(args, &visit_time);
+  if (!ExtractIntegerValue(args, &visit_time)) {
+    LOG(ERROR) << "Unable to extract integer argument.";
+    web_ui_->CallJavascriptFunction("deleteFailed");
+    return;
+  }
   base::Time::Exploded exploded;
   base::Time::FromTimeT(
       static_cast<time_t>(visit_time)).LocalExplode(&exploded);
   exploded.hour = exploded.minute = exploded.second = exploded.millisecond = 0;
   base::Time begin_time = base::Time::FromLocalExploded(exploded);
   base::Time end_time = begin_time + base::TimeDelta::FromDays(1);
 
   // Get URLs.
-  std::set<GURL> urls;
+  DCHECK(urls_to_be_deleted_.empty());
   for (ListValue::const_iterator v = args->begin() + 1;
        v != args->end(); ++v) {
     if ((*v)->GetType() != Value::TYPE_STRING)
       continue;
     const StringValue* string_value = static_cast<const StringValue*>(*v);
     string16 string16_value;
     if (!string_value->GetAsString(&string16_value))
       continue;
-    urls.insert(GURL(string16_value));
+
+    urls_to_be_deleted_.insert(GURL(string16_value));
   }
 
   HistoryService* hs =
       Profile::FromWebUI(web_ui_)->GetHistoryService(Profile::EXPLICIT_ACCESS);
   hs->ExpireHistoryBetween(
-      urls, begin_time, end_time, &cancelable_delete_consumer_,
+      urls_to_be_deleted_, begin_time, end_time, &cancelable_delete_consumer_,
       base::Bind(&BrowsingHistoryHandler::RemoveComplete,
                  base::Unretained(this)));
 }
 
 void BrowsingHistoryHandler::HandleClearBrowsingData(const ListValue* args) {
   // TODO(beng): This is an improper direct dependency on Browser. Route this
   // through some sort of delegate.
   Profile* profile = Profile::FromWebUI(web_ui_);
   Browser* browser = BrowserList::FindBrowserWithProfile(profile);
   if (browser)
@@ skipping 49 matching lines @@
   }
 
   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::RemoveComplete() {
-  // Some Visits were deleted from history. Reload the list.
+  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,
-      string16* query) {
-  CHECK(args->GetSize() == 2);
-  query->clear();
-  CHECK(args->GetString(0, query));
+    const ListValue* args,
+    int* month,
+    string16* query) {
+  *month = 0;
+  Value* list_member;
 
-  string16 string16_value;
-  CHECK(args->GetString(1, &string16_value));
-  *month = 0;
-  base::StringToInt(string16_value, month);
+  // Get search string.
+  if (args->Get(0, &list_member) &&
+      list_member->GetType() == Value::TYPE_STRING) {
+    const StringValue* string_value =
+      static_cast<const StringValue*>(list_member);
+    string_value->GetAsString(query);
+  }
+
+  // Get search month.
+  if (args->Get(1, &list_member) &&
+      list_member->GetType() == Value::TYPE_STRING) {
+    const StringValue* string_value =
+      static_cast<const StringValue*>(list_member);
+    string16 string16_value;
+    if (string_value->GetAsString(&string16_value))
+      base::StringToInt(string16_value, month);
+  }
 }
 
 history::QueryOptions BrowsingHistoryHandler::CreateMonthQueryOptions(
     int month) {
   history::QueryOptions options;
 
   // Configure the begin point of the search to the start of the
   // current month.
   base::Time::Exploded exploded;
   base::Time::Now().LocalMidnight().LocalExplode(&exploded);
@@ skipping 33 matching lines @@
 }
 
 void BrowsingHistoryHandler::Observe(
     int type,
     const content::NotificationSource& source,
     const content::NotificationDetails& details) {
   if (type != chrome::NOTIFICATION_HISTORY_URLS_DELETED) {
     NOTREACHED();
     return;
   }
-
-  // Some URLs were deleted from history. Reload the list.
-  web_ui_->CallJavascriptFunction("historyDeleted");
+  history::URLsDeletedDetails* deletedDetails =
+      content::Details<history::URLsDeletedDetails>(details).ptr();
+  if (deletedDetails->urls != urls_to_be_deleted_) {
+    // Notify the page that someone else deleted from the history.
+    web_ui_->CallJavascriptFunction("historyDeleted");
+  }
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 //
 // HistoryUI
 //
 ////////////////////////////////////////////////////////////////////////////////
 
 HistoryUI::HistoryUI(TabContents* contents) : ChromeWebUI(contents) {
   AddMessageHandler((new BrowsingHistoryHandler())->Attach(this));
 
   HistoryUIHTMLSource* html_source = new HistoryUIHTMLSource();
 
   // Set up the chrome://history/ source.
   Profile* profile = Profile::FromBrowserContext(contents->browser_context());
   profile->GetChromeURLDataManager()->AddDataSource(html_source);
 }
 
 // static
 const GURL HistoryUI::GetHistoryURLWithSearchText(const string16& text) {
   return GURL(std::string(chrome::kChromeUIHistoryURL) + "#q=" +
               net::EscapeQueryParamValue(UTF16ToUTF8(text), true));
 }
 
 // static
 RefCountedMemory* HistoryUI::GetFaviconResourceBytes() {
   return ResourceBundle::GetSharedInstance().
       LoadDataResourceBytes(IDR_HISTORY_FAVICON);
 }