"domain" item added to HistoryEntry to allow showing IDN in chrome://history/

chrome/browser/resources/history/history.js

 // 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 src="../uber/uber_utils.js">
 <include src="history_focus_manager.js">
 
 ///////////////////////////////////////////////////////////////////////////////
 // Globals:
 /** @const */ var RESULTS_PER_PAGE = 150;
@@ skipping 69 matching lines @@
  * @param {Object} result An object containing the visit's data.
  * @param {boolean} continued Whether this visit is on the same day as the
  *     visit before it.
  * @param {HistoryModel} model The model object this entry belongs to.
  * @constructor
  */
 function Visit(result, continued, model) {
   this.model_ = model;
   this.title_ = result.title;
   this.url_ = result.url;
+  this.domain_ = result.domain;
   this.starred_ = result.starred;
   this.snippet_ = result.snippet || '';
 
   // These identify the name and type of the device on which this visit
   // occurred. They will be empty if the visit occurred on the current device.
   this.deviceName = result.deviceName;
   this.deviceType = result.deviceType;
 
   // The ID will be set according to when the visit was displayed, not
   // received. Set to -1 to show that it has not been set yet.
@@ skipping 69 matching lines @@
   // Keep track of the drop down that triggered the menu, so we know
   // which element to apply the command to.
   // TODO(dubroy): Ideally we'd use 'activate', but MenuButton swallows it.
   var self = this;
   var setActiveVisit = function(e) {
     activeVisit = self;
     var menu = $('action-menu');
     menu.dataset.devicename = self.deviceName;
     menu.dataset.devicetype = self.deviceType;
   };
-  domain.textContent = this.getDomainFromURL_(this.url_);
+  domain.textContent = this.domain_;
 
   entryBox.appendChild(time);
 
   var bookmarkSection = createElementWithClassName('div', 'bookmark-section');
   if (this.starred_) {
     bookmarkSection.classList.add('starred');
     bookmarkSection.addEventListener('click', function f(e) {
       recordUmaAction('HistoryPage_BookmarkStarClicked');
       bookmarkSection.classList.remove('starred');
       chrome.send('removeBookmark', [self.url_]);
@@ skipping 85 matching lines @@
   recordUmaAction('HistoryPage_EntryMenuRemoveFromHistory');
   var self = this;
   this.model_.removeVisitsFromHistory([this], function() {
     removeEntryFromView(self.domNode_);
   });
 };
 
 // Visit, private: ------------------------------------------------------------
 
 /**
- * Extracts and returns the domain (and subdomains) from a URL.
- * @param {string} url The url.
- * @return {string} The domain. An empty string is returned if no domain can
- *     be found.
- * @private
- */
-Visit.prototype.getDomainFromURL_ = function(url) {
-  // TODO(sergiu): Extract the domain from the C++ side and send it here.
-  var domain = url.replace(/^.+?:\/\//, '').match(/[^/]+/);
-  return domain ? domain[0] : '';
-};
-
-/**
  * Add child text nodes to a node such that occurrences of the specified text is
  * highlighted.
  * @param {Node} node The node under which new text nodes will be made as
  *     children.
  * @param {string} content Text to be added beneath |node| as one or more
  *     text nodes.
  * @param {string} highlightText Occurences of this text inside |content| will
  *     be highlighted.
  * @private
  */
@@ skipping 60 matching lines @@
 /**
  * Returns the DOM element containing the text for a blocked visit attempt.
  * @return {Element} DOM representation of the visit attempt.
  * @private
  */
 Visit.prototype.getVisitAttemptDOM_ = function() {
   var node = createElementWithClassName('div', 'title');
   node.innerHTML = loadTimeData.getStringF('blockedVisitText',
                                            this.url_,
                                            this.id_,
-                                           this.getDomainFromURL_(this.url_));
+                                           this.domain_);
   return node;
 };
 
 /**
  * Set the favicon for an element.
  * @param {Element} el The DOM element to which to add the icon.
  * @private
  */
 Visit.prototype.addFaviconToElement_ = function(el) {
   var url = isMobileVersion() ?
       getFaviconImageSet(this.url_, 32, 'touch-icon') :
       getFaviconImageSet(this.url_);
   el.style.backgroundImage = url;
 };
 
 /**
  * Launch a search for more history entries from the same domain.
  * @private
  */
 Visit.prototype.showMoreFromSite_ = function() {
   recordUmaAction('HistoryPage_EntryMenuShowMoreFromSite');
-  historyView.setSearch(this.getDomainFromURL_(this.url_));
+  historyView.setSearch(this.domain_);
 };
 
 // Visit, private, static: ----------------------------------------------------
 
 /**
  * Quote a string so it can be used in a regular expression.
  * @param {string} str The source string.
  * @return {string} The escaped string.
  * @private
  */
@@ skipping 706 matching lines @@
  * @param {Array} visits Visits received from the query results.
  * @param {Element} results Object where the results are added to.
  * @private
  */
 HistoryView.prototype.groupVisitsByDomain_ = function(visits, results) {
   var visitsByDomain = {};
   var domains = [];
 
   // Group the visits into a dictionary and generate a list of domains.
   for (var i = 0, visit; visit = visits[i]; i++) {
-    var domain = visit.getDomainFromURL_(visit.url_);
+    var domain = visit.domain_;
     if (!visitsByDomain[domain]) {
       visitsByDomain[domain] = [];
       domains.push(domain);
     }
     visitsByDomain[domain].push(visit);
   }
   var sortByVisits = function(a, b) {
     return visitsByDomain[b].length - visitsByDomain[a].length;
   };
   domains.sort(sortByVisits);
@@ skipping 785 matching lines @@
     historyView.reload();
 }
 
 // Add handlers to HTML elements.
 document.addEventListener('DOMContentLoaded', load);
 
 // This event lets us enable and disable menu items before the menu is shown.
 document.addEventListener('canExecute', function(e) {
   e.canExecute = true;
 });