Stop history search going on beyond the start of history....

chrome/browser/dom_ui/history_ui.cc

 // Copyright (c) 2006-2008 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/dom_ui/history_ui.h"
 
 #include "base/message_loop.h"
 #include "base/string_piece.h"
 #include "base/string_util.h"
 #include "base/thread.h"
@@ skipping 58 matching lines @@
       l10n_util::GetString(IDS_HISTORY_SEARCH_BUTTON));
   localized_strings.SetString(L"noresults",
       l10n_util::GetString(IDS_HISTORY_NO_RESULTS));
   localized_strings.SetString(L"noitems",
       l10n_util::GetString(IDS_HISTORY_NO_ITEMS));
   localized_strings.SetString(L"deleteday",
       l10n_util::GetString(IDS_HISTORY_DELETE_PRIOR_VISITS_LINK));
   localized_strings.SetString(L"deletedaywarning",
       l10n_util::GetString(IDS_HISTORY_DELETE_PRIOR_VISITS_WARNING));
 
+  localized_strings.SetString(L"textdirection",
+      (l10n_util::GetTextDirection() == l10n_util::RIGHT_TO_LEFT) ?
+       L"rtl" : L"ltr");
+
   static const StringPiece history_html(
       ResourceBundle::GetSharedInstance().GetRawDataResource(
           IDR_HISTORY_HTML));
   const std::string full_html = jstemplate_builder::GetTemplateHtml(
       history_html, &localized_strings, "t");
 
   scoped_refptr<RefCountedBytes> html_bytes(new RefCountedBytes);
   html_bytes->data.resize(full_html.size());
   std::copy(full_html.begin(), full_html.end(), html_bytes->data.begin());
 
   SendResponse(request_id, html_bytes);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 //
 // HistoryHandler
 //
 ////////////////////////////////////////////////////////////////////////////////
 BrowsingHistoryHandler::BrowsingHistoryHandler(DOMUI* dom_ui)
     : DOMMessageHandler(dom_ui),
       search_text_(),
       remover_(NULL) {
   dom_ui_->RegisterMessageCallback("getHistory",
       NewCallback(this, &BrowsingHistoryHandler::HandleGetHistory));
   dom_ui_->RegisterMessageCallback("searchHistory",
-    NewCallback(this, &BrowsingHistoryHandler::HandleSearchHistory));
+      NewCallback(this, &BrowsingHistoryHandler::HandleSearchHistory));
   dom_ui_->RegisterMessageCallback("deleteDay",
-    NewCallback(this, &BrowsingHistoryHandler::HandleDeleteDay));
+      NewCallback(this, &BrowsingHistoryHandler::HandleDeleteDay));
 
   // Create our favicon data source.
   g_browser_process->io_thread()->message_loop()->PostTask(FROM_HERE,
       NewRunnableMethod(&chrome_url_data_manager,
                         &ChromeURLDataManager::AddDataSource,
                         new FavIconSource(dom_ui_->get_profile())));
 
   // Get notifications when history is cleared.
   NotificationService* service = NotificationService::current();
   service->AddObserver(this, NotificationType::HISTORY_URLS_DELETED,
@@ skipping 19 matching lines @@
   int day = 0;
   ExtractIntegerValue(value, &day);
 
   // Set our query options.
   history::QueryOptions options;
   options.begin_time = Time::Now().LocalMidnight();
   options.begin_time -= TimeDelta::FromDays(day);
   options.end_time = Time::Now().LocalMidnight();
   options.end_time -= TimeDelta::FromDays(day - 1);
 
+  // As we're querying per-day, we can turn entry repeats off.
+  options.most_recent_visit_only = true;
+
   // Need to remember the query string for our results.
   search_text_ = std::wstring();
 
   HistoryService* hs =
       dom_ui_->get_profile()->GetHistoryService(Profile::EXPLICIT_ACCESS);
   hs->QueryHistory(search_text_,
       options,
       &cancelable_consumer_,
       NewCallback(this, &BrowsingHistoryHandler::QueryComplete));
 }
@@ skipping 96 matching lines @@
     } else {
       page_value->SetString(L"dateShort",
           base::TimeFormatShortDate(page.visit_time()));
       page_value->SetString(L"snippet", page.snippet().text());
     }
     page_value->SetBoolean(L"starred",
         dom_ui_->get_profile()->GetBookmarkModel()->IsBookmarked(page.url()));
     results_value.Append(page_value);
   }
 
-  StringValue temp(search_text_);
-  dom_ui_->CallJavascriptFunction(L"historyResult", temp, results_value);
+  DictionaryValue info_value;
+  info_value.SetString(L"term", search_text_);
+  info_value.SetBoolean(L"finished", results->reached_beginning());
+
+  dom_ui_->CallJavascriptFunction(L"historyResult", info_value, results_value);
 }
 
 void BrowsingHistoryHandler::ExtractSearchHistoryArguments(const Value* value,
     int* month, std::wstring* query) {
   *month = 0;
 
   if (value && value->GetType() == Value::TYPE_LIST) {
     const ListValue* list_value = static_cast<const ListValue*>(value);
     Value* list_member;
 
@@ skipping 61 matching lines @@
 }
 
 void BrowsingHistoryHandler::Observe(NotificationType type,
                                      const NotificationSource& source,
                                      const NotificationDetails& details) {
   if (type != NotificationType::HISTORY_URLS_DELETED) {
     NOTREACHED();
     return;
   }
 
-  // Some URLs were deleted from history.  Reload the most visited list.
-  HandleGetHistory(NULL);
+  // Some URLs were deleted from history. Reload the list.
+  dom_ui_->CallJavascriptFunction(L"historyDeleted");
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 //
 // HistoryUIContents
 //
 ////////////////////////////////////////////////////////////////////////////////
 
 HistoryUI::HistoryUI(DOMUIContents* contents) : DOMUI(contents) {
 }
@@ skipping 13 matching lines @@
 // static
 GURL HistoryUI::GetBaseURL() {
   std::string url = DOMUIContents::GetScheme();
   url += "://";
   url += kHistoryHost;
   return GURL(url);
 }
 
 // static
 const GURL HistoryUI::GetHistoryURLWithSearchText(
-  const std::wstring& text) {
-    return GURL(GetBaseURL().spec() + "#q=" +
+    const std::wstring& text) {
+  return GURL(GetBaseURL().spec() + "#q=" +
       EscapeQueryParamValue(WideToUTF8(text)));
 }