Enable history and downloads by default, port NewTabUI from DOMUIHost to DOMU...

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"
 #include "base/time.h"
 #include "base/time_format.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/metrics/user_metrics.h"
 #include "chrome/browser/history/history_types.h"
 #include "chrome/browser/profile.h"
 #include "chrome/common/jstemplate_builder.h"
 #include "chrome/common/l10n_util.h"
 #include "chrome/common/notification_service.h"
 #include "chrome/common/resource_bundle.h"
 #include "chrome/common/time_format.h"
+#include "net/base/escape.h"
+
 #include "grit/browser_resources.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 
 using base::Time;
 using base::TimeDelta;
 
 // HistoryUI is accessible from chrome-ui://history.
 static const char kHistoryHost[] = "history";
 
-// Maximum number of search results to return in a given search. We should 
+// Maximum number of search results to return in a given search. We should
 // eventually remove this.
 static const int kMaxSearchResults = 100;
 
 ////////////////////////////////////////////////////////////////////////////////
 //
 // HistoryHTMLSource
 //
 ////////////////////////////////////////////////////////////////////////////////
 
 HistoryUIHTMLSource::HistoryUIHTMLSource()
@@ skipping 95 matching lines @@
   options.end_time = Time::Now().LocalMidnight();
   options.end_time -= TimeDelta::FromDays(day - 1);
 
   // 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_, 
+      &cancelable_consumer_,
       NewCallback(this, &BrowsingHistoryHandler::QueryComplete));
 }
 
 void BrowsingHistoryHandler::HandleSearchHistory(const Value* value) {
   // Anything in-flight is invalid.
   cancelable_consumer_.CancelAllRequests();
 
   // Get arguments (if any).
   int month = 0;
   std::wstring query;
   ExtractSearchHistoryArguments(value, &month, &query);
 
   // Set the query ranges for the given month.
   history::QueryOptions options = CreateMonthQueryOptions(month);
 
   // When searching, limit the number of results returned and only show the
   // most recent matches.
   options.max_count = kMaxSearchResults;
   options.most_recent_visit_only = true;
 
   // Need to remember the query string for our results.
   search_text_ = query;
   HistoryService* hs =
       dom_ui_->get_profile()->GetHistoryService(Profile::EXPLICIT_ACCESS);
   hs->QueryHistory(search_text_,
       options,
-      &cancelable_consumer_, 
+      &cancelable_consumer_,
       NewCallback(this, &BrowsingHistoryHandler::QueryComplete));
 }
 
 void BrowsingHistoryHandler::HandleDeleteDay(const Value* value) {
   // Anything in-flight is invalid.
   cancelable_consumer_.CancelAllRequests();
 
   // Get time.
   Time time;
   bool success = Time::FromString(ExtractStringValue(value).c_str(), &time);
@@ skipping 24 matching lines @@
 
   ListValue results_value;
   Time midnight_today = Time::Now().LocalMidnight();
 
   for (size_t i = 0; i < results->size(); ++i) {
     history::URLResult const &page = (*results)[i];
     DictionaryValue* page_value = new DictionaryValue();
     SetURLAndTitle(page_value, page.title(), page.url());
 
     // Need to pass the time in epoch time (fastest JS conversion).
-    page_value->SetInteger(L"time", 
+    page_value->SetInteger(L"time",
         static_cast<int>(page.visit_time().ToTimeT()));
 
     // Until we get some JS i18n infrastructure, we also need to
-    // pass the dates in as strings. This could use some 
+    // pass the dates in as strings. This could use some
     // optimization.
 
     // Only pass in the strings we need (search results need a shortdate
     // and snippet, browse results need day and time information).
     if (search_text_.empty()) {
       // Figure out the relative date string.
       std::wstring date_str = TimeFormat::RelativeDate(page.visit_time(),
                                                        &midnight_today);
       if (date_str.empty()) {
         date_str = base::TimeFormatFriendlyDate(page.visit_time());
       } else {
         date_str = l10n_util::GetStringF(
             IDS_HISTORY_DATE_WITH_RELATIVE_TIME,
             date_str, base::TimeFormatFriendlyDate(page.visit_time()));
       }
       page_value->SetString(L"dateRelativeDay", date_str);
-      page_value->SetString(L"dateTimeOfDay", 
+      page_value->SetString(L"dateTimeOfDay",
           base::TimeFormatTimeOfDay(page.visit_time()));
     } else {
-      page_value->SetString(L"dateShort", 
+      page_value->SetString(L"dateShort",
           base::TimeFormatShortDate(page.visit_time()));
       page_value->SetString(L"snippet", page.snippet().text());
     }
 
     results_value.Append(page_value);
   }
 
   StringValue temp(search_text_);
   dom_ui_->CallJavascriptFunction(L"historyResult", temp, results_value);
 }
 
-void BrowsingHistoryHandler::ExtractSearchHistoryArguments(const Value* 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;
 
     // Get search string.
     if (list_value->Get(0, &list_member) &&
         list_member->GetType() == Value::TYPE_STRING) {
@@ skipping 90 matching lines @@
           html_source));
 }
 
 // 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=" +
+      EscapeQueryParamValue(WideToUTF8(text)));
+}