"domain" item added to HistoryEntry to allow showing IDN in chrome://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_
 
+#include <string>
+
 #include "base/strings/string16.h"
 #include "base/timer/timer.h"
 #include "base/values.h"
 #include "chrome/browser/common/cancelable_request.h"
 #include "chrome/browser/history/history_service.h"
 #include "chrome/browser/history/web_history_service.h"
 #include "chrome/common/cancelable_task_tracker.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"
@@ skipping 15 matching lines @@
     enum EntryType {
       EMPTY_ENTRY = 0,
       LOCAL_ENTRY,
       REMOTE_ENTRY,
       COMBINED_ENTRY
     };
 
     HistoryEntry(EntryType 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);
+                 bool blocked_visit, const std::string& languages);
     HistoryEntry();
     virtual ~HistoryEntry();
 
     // Formats this entry's URL and title and adds them to |result|.
     void SetUrlAndTitle(DictionaryValue* result) const;
 
+    // Formats this entry's displayable domain and adds it to |result|.
+    void SetDisplayableDomain(DictionaryValue* result) const;
+
     // Converts the entry to a DictionaryValue to be owned by the caller.
     scoped_ptr<DictionaryValue> ToValue(
         BookmarkModel* bookmark_model,
         ManagedUserService* managed_user_service,
         const ProfileSyncService* sync_service) const;
 
     // Comparison function for sorting HistoryEntries from newest to oldest.
     static bool SortByTimeDescending(
         const HistoryEntry& entry1, const HistoryEntry& entry2);
 
@@ skipping 14 matching lines @@
     std::set<int64> all_timestamps;
 
     // If true, this entry is a search result.
     bool is_search_result;
 
     // The entry's search snippet, if this entry is a search result.
     string16 snippet;
 
     // Whether this entry was blocked when it was attempted.
     bool blocked_visit;
+
+    // kAcceptLanguages pref value.
+    std::string languages;

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

Nit: Might as well call this "accept_languages".

   };
 
   BrowsingHistoryHandler();
   virtual ~BrowsingHistoryHandler();
 
   // WebUIMessageHandler implementation.
   virtual void RegisterMessages() OVERRIDE;
 
   // Handler for the "queryHistory" message.
   void HandleQueryHistory(const base::ListValue* args);
@@ skipping 62 matching lines @@
 
   bool ExtractIntegerValueAtIndex(
       const base::ListValue* value, int index, int* out_int);
 
   // Sets the query options for a week-wide query, |offset| weeks ago.
   void SetQueryTimeInWeeks(int offset, history::QueryOptions* options);
 
   // Sets the query options for a monthly query, |offset| months ago.
   void SetQueryTimeInMonths(int offset, history::QueryOptions* options);
 
+  // kAcceptLanguages pref value.
+  std::string GetLanguages() const;

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

...and this, "GetAcceptLanguages()"

+
   content::NotificationRegistrar registrar_;
 
   // Consumer for search requests to the history service.
   CancelableRequestConsumerT<int, 0> history_request_consumer_;
 
   // The currently-executing request for synced history results.
   // Deleting the request will cancel it.
   scoped_ptr<history::WebHistoryService::Request> web_history_request_;
 
   // The currently-executing delete request for synced history.
@@ skipping 29 matching lines @@
   static const GURL GetHistoryURLWithSearchText(const string16& text);
 
   static base::RefCountedMemory* GetFaviconResourceBytes(
       ui::ScaleFactor scale_factor);
 
  private:
   DISALLOW_COPY_AND_ASSIGN(HistoryUI);
 };
 
 #endif  // CHROME_BROWSER_UI_WEBUI_HISTORY_UI_H_