"domain" item added to HistoryEntry to allow showing IDN in chrome://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"
@@ skipping 33 matching lines @@
 #include "chrome/common/url_constants.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_source.h"
 #include "content/public/browser/url_data_source.h"
 #include "content/public/browser/web_ui.h"
 #include "content/public/browser/web_ui_data_source.h"
 #include "grit/browser_resources.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "net/base/escape.h"
+#include "net/base/net_util.h"
 #include "sync/protocol/history_delete_directive_specifics.pb.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 
 #if defined(ENABLE_MANAGED_USERS)
 #include "chrome/browser/managed_mode/managed_mode_navigation_observer.h"
 #include "chrome/browser/managed_mode/managed_mode_url_filter.h"
 #include "chrome/browser/managed_mode/managed_user_service.h"
 #include "chrome/browser/managed_mode/managed_user_service_factory.h"
 #endif
@@ skipping 205 matching lines @@
 ////////////////////////////////////////////////////////////////////////////////
 //
 // BrowsingHistoryHandler
 //
 ////////////////////////////////////////////////////////////////////////////////
 
 BrowsingHistoryHandler::HistoryEntry::HistoryEntry(
     BrowsingHistoryHandler::HistoryEntry::EntryType entry_type,
     const GURL& url, const string16& title, base::Time time,
     const std::string& client_id, bool is_search_result,
-    const string16& snippet, bool blocked_visit) {
+    const string16& snippet, bool blocked_visit,
+    const std::string& languages) {
   this->entry_type = entry_type;
   this->url = url;
   this->title = title;
   this->time = time;
   this->client_id = client_id;
   all_timestamps.insert(time.ToInternalValue());
   this->is_search_result = is_search_result;
   this->snippet = snippet;
   this->blocked_visit = blocked_visit;
+  this->languages = languages;
 }
 
 BrowsingHistoryHandler::HistoryEntry::HistoryEntry()
     : entry_type(EMPTY_ENTRY), is_search_result(false), blocked_visit(false) {
 }
 
 BrowsingHistoryHandler::HistoryEntry::~HistoryEntry() {
 }
 
 void BrowsingHistoryHandler::HistoryEntry::SetUrlAndTitle(
@@ skipping 13 matching lines @@
   // left to right strings.
   if (base::i18n::IsRTL()) {
     if (using_url_as_the_title)
       base::i18n::WrapStringWithLTRFormatting(&title_to_set);
     else
       base::i18n::AdjustStringForLocaleDirection(&title_to_set);
   }
   result->SetString("title", title_to_set);
 }
 
+void BrowsingHistoryHandler::HistoryEntry::SetDisplayableDomain(

[Patrick Dubroy, 2013/08/20 14:26:37]

I don't see much value in having this as a separate function -- I would just
inline it at the call site.

+    DictionaryValue* result) const {
+  result->SetString("displayableDomain",
+                    net::IDNToUnicode(url.host(), languages));
+}
+
 scoped_ptr<DictionaryValue> BrowsingHistoryHandler::HistoryEntry::ToValue(
     BookmarkModel* bookmark_model,
     ManagedUserService* managed_user_service,
     const ProfileSyncService* sync_service) const {
   scoped_ptr<DictionaryValue> result(new DictionaryValue());
   SetUrlAndTitle(result.get());
+  SetDisplayableDomain(result.get());
   result->SetDouble("time", time.ToJsTime());
 
   // Pass the timestamps in a list.
   scoped_ptr<ListValue> timestamps(new ListValue);
   for (std::set<int64>::const_iterator it = all_timestamps.begin();
        it != all_timestamps.end(); ++it) {
     timestamps->AppendDouble(base::Time::FromInternalValue(*it).ToJsTime());
   }
   result->Set("allTimestamps", timestamps.release());
 
@@ skipping 396 matching lines @@
   web_history_query_results_.clear();
 }
 
 void BrowsingHistoryHandler::QueryComplete(
     const string16& search_text,
     const history::QueryOptions& options,
     HistoryService::Handle request_handle,
     history::QueryResults* results) {
   DCHECK_EQ(0U, query_results_.size());
   query_results_.reserve(results->size());
+  const std::string languages = GetLanguages();
 
   for (size_t i = 0; i < results->size(); ++i) {
     history::URLResult const &page = (*results)[i];
     // TODO(dubroy): Use sane time (crbug.com/146090) here when it's ready.
     query_results_.push_back(
         HistoryEntry(
             HistoryEntry::LOCAL_ENTRY,
             page.url(),
             page.title(),
             page.visit_time(),
             std::string(),
             !search_text.empty(),
             page.snippet().text(),
-            page.blocked_visit()));
+            page.blocked_visit(),
+            languages));
   }
 
   results_info_value_.SetString("term", search_text);
   results_info_value_.SetBoolean("finished", results->reached_beginning());
 
   // Add the specific dates that were searched to display them.
   // TODO(sergiu): Put today if the start is in the future.
   results_info_value_.SetString("queryStartTime",
                                 getRelativeDateLocalized(options.begin_time));
   if (!options.end_time.is_null()) {
     results_info_value_.SetString("queryEndTime",
         getRelativeDateLocalized(options.end_time -
                                  base::TimeDelta::FromDays(1)));
   } else {
     results_info_value_.SetString("queryEndTime",
         getRelativeDateLocalized(base::Time::Now()));
   }
   if (!web_history_timer_.IsRunning())
     ReturnResultsToFrontEnd();
 }
 
 void BrowsingHistoryHandler::WebHistoryQueryComplete(
     const string16& search_text,
     const history::QueryOptions& options,
     base::TimeTicks start_time,
     history::WebHistoryService::Request* request,
     const DictionaryValue* results_value) {
   base::TimeDelta delta = base::TimeTicks::Now() - start_time;
   UMA_HISTOGRAM_TIMES("WebHistory.ResponseTime", delta);
+  const std::string languages = GetLanguages();
 
   // If the response came in too late, do nothing.
   // TODO(dubroy): Maybe show a banner, and prompt the user to reload?
   if (!web_history_timer_.IsRunning())
     return;
   web_history_timer_.Stop();
 
   UMA_HISTOGRAM_ENUMERATION(
       "WebHistory.QueryCompletion",
       results_value ? WEB_HISTORY_QUERY_SUCCEEDED : WEB_HISTORY_QUERY_FAILED,
@@ skipping 47 matching lines @@
 
         web_history_query_results_.push_back(
             HistoryEntry(
                 HistoryEntry::REMOTE_ENTRY,
                 GURL(url),
                 title,
                 time,
                 client_id,
                 !search_text.empty(),
                 string16(),
-                /* blocked_visit */ false));
+                /* blocked_visit */ false,
+                languages));
       }
     }
   } else if (results_value) {
     NOTREACHED() << "Failed to parse JSON response.";
   }
   results_info_value_.SetBoolean("hasSyncedResults", results_value != NULL);
   if (!history_request_consumer_.HasPendingRequests())
     ReturnResultsToFrontEnd();
 }
 
@@ skipping 82 matching lines @@
     NOTREACHED();
     return;
   }
   history::URLsDeletedDetails* deletedDetails =
       content::Details<history::URLsDeletedDetails>(details).ptr();
   if (deletedDetails->all_history ||
       DeletionsDiffer(deletedDetails->rows, urls_to_be_deleted_))
     web_ui()->CallJavascriptFunction("historyDeleted");
 }
 
+std::string BrowsingHistoryHandler::GetLanguages() const {
+  Profile* profile = Profile::FromWebUI(web_ui());
+  return profile ? profile->GetPrefs()->GetString(prefs::kAcceptLanguages) :

[Patrick Dubroy, 2013/08/20 14:26:37]

Nit: looks like this actually fits on one line.

+                   "";
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 //
 // HistoryUI
 //
 ////////////////////////////////////////////////////////////////////////////////
 
 HistoryUI::HistoryUI(content::WebUI* web_ui) : WebUIController(web_ui) {
   web_ui->AddMessageHandler(new BrowsingHistoryHandler());
   web_ui->AddMessageHandler(new MetricsHandler());
 
@@ skipping 15 matching lines @@
   return GURL(std::string(chrome::kChromeUIHistoryURL) + "#q=" +
               net::EscapeQueryParamValue(UTF16ToUTF8(text), true));
 }
 
 // static
 base::RefCountedMemory* HistoryUI::GetFaviconResourceBytes(
       ui::ScaleFactor scale_factor) {
   return ResourceBundle::GetSharedInstance().
       LoadDataResourceBytesForScale(IDR_HISTORY_FAVICON, scale_factor);
 }