MD History: Remove shadow root from <history-searched-label>

chrome/browser/resources/md_history/app.crisper.js

 // Copyright 2016 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.
 function PromiseResolver() {
   this.resolve_;
   this.reject_;
   this.promise_ = new Promise(function(resolve, reject) {
     this.resolve_ = resolve;
     this.reject_ = reject;
   }.bind(this));
@@ skipping 6667 matching lines @@
     }
   }
 });
 
 // Copyright 2016 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.
 cr.define('cr.icon', function() {
   function getSupportedScaleFactors() {
     var supportedScaleFactors = [];
+    if (!cr.isIOS) {
+      supportedScaleFactors.push(1);
+    }
     if (cr.isMac || cr.isChromeOS || cr.isWindows || cr.isLinux) {
-      supportedScaleFactors.push(1);
       supportedScaleFactors.push(2);
     } else {
       supportedScaleFactors.push(window.devicePixelRatio);
     }
     return supportedScaleFactors;
   }
-  function getProfileAvatarIcon(path) {
-    var chromeThemePath = 'chrome://theme';
-    var isDefaultAvatar = path.slice(0, chromeThemePath.length) == chromeThemePath;
-    return isDefaultAvatar ? imageset(path + '@scalefactorx') : url(path);
-  }
-  function imageset(path) {
+  function getImageSet(path) {
     var supportedScaleFactors = getSupportedScaleFactors();
     var replaceStartIndex = path.indexOf('scalefactor');
     if (replaceStartIndex < 0) return url(path);
     var s = '';
     for (var i = 0; i < supportedScaleFactors.length; ++i) {
       var scaleFactor = supportedScaleFactors[i];
       var pathWithScaleFactor = path.substr(0, replaceStartIndex) + scaleFactor + path.substr(replaceStartIndex + 'scalefactor'.length);
       s += url(pathWithScaleFactor) + ' ' + scaleFactor + 'x';
       if (i != supportedScaleFactors.length - 1) s += ', ';
     }
     return '-webkit-image-set(' + s + ')';
   }
+  function getImage(path) {
+    var chromeThemePath = 'chrome://theme';
+    var isChromeThemeUrl = path.slice(0, chromeThemePath.length) == chromeThemePath;
+    return isChromeThemeUrl ? getImageSet(path + '@scalefactorx') : url(path);
+  }
   var FAVICON_URL_REGEX = /\.ico$/i;
-  function getFaviconImageSet(url, opt_size, opt_type) {
+  function getFavicon(url, opt_size, opt_type) {
     var size = opt_size || 16;
     var type = opt_type || 'favicon';
-    return imageset('chrome://' + type + '/size/' + size + '@scalefactorx/' + (FAVICON_URL_REGEX.test(url) ? 'iconurl/' : '') + url);
+    return getImageSet('chrome://' + type + '/size/' + size + '@scalefactorx/' + (FAVICON_URL_REGEX.test(url) ? 'iconurl/' : '') + url);
   }
   return {
-    getSupportedScaleFactors: getSupportedScaleFactors,
-    getProfileAvatarIcon: getProfileAvatarIcon,
-    getFaviconImageSet: getFaviconImageSet
+    getImage: getImage,
+    getFavicon: getFavicon
   };
 });
 
 // Copyright 2016 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.
 Polymer({
   is: 'history-searched-label',
   properties: {
     title: String,
     searchTerm: String
   },
   observers: [ 'setSearchedTextToBold_(title, searchTerm)' ],
   setSearchedTextToBold_: function() {
     var i = 0;
-    var titleElem = this.$.container;
     var titleText = this.title;
     if (this.searchTerm == '' || this.searchTerm == null) {
-      titleElem.textContent = titleText;
+      this.textContent = titleText;
       return;
     }
     var re = new RegExp(quoteString(this.searchTerm), 'gim');
     var match;
-    titleElem.textContent = '';
+    this.textContent = '';
     while (match = re.exec(titleText)) {
-      if (match.index > i) titleElem.appendChild(document.createTextNode(titleText.slice(i, match.index)));
+      if (match.index > i) this.appendChild(document.createTextNode(titleText.slice(i, match.index)));
       i = re.lastIndex;
       var b = document.createElement('b');
       b.textContent = titleText.substring(match.index, i);
-      titleElem.appendChild(b);
+      this.appendChild(b);
     }
-    if (i < titleText.length) titleElem.appendChild(document.createTextNode(titleText.slice(i)));
+    if (i < titleText.length) this.appendChild(document.createTextNode(titleText.slice(i)));
   }
 });
 
 // Copyright 2015 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.
 cr.define('md_history', function() {
   var HistoryItem = Polymer({
     is: 'history-item',
     properties: {
@@ skipping 71 matching lines @@
       if (this.index == undefined) return;
       browserService.recordHistogram('HistoryPage.ClickPosition', this.index, UMA_MAX_BUCKET_VALUE);
       if (this.index <= UMA_MAX_SUBSET_BUCKET_VALUE) {
         browserService.recordHistogram('HistoryPage.ClickPositionSubset', this.index, UMA_MAX_SUBSET_BUCKET_VALUE);
       }
     },
     onLinkRightClick_: function() {
       md_history.BrowserService.getInstance().recordAction('EntryLinkRightClick');
     },
     showIcon_: function() {
-      this.$.icon.style.backgroundImage = cr.icon.getFaviconImageSet(this.item.url);
+      this.$.icon.style.backgroundImage = cr.icon.getFavicon(this.item.url);
     },
     selectionNotAllowed_: function() {
       return !loadTimeData.getBoolean('allowDeletingHistory');
     },
     cardTitle_: function(numberOfItems, historyDate, search) {
       if (!search) return this.item.dateRelativeDay;
       var resultId = numberOfItems == 1 ? 'searchResult' : 'searchResults';
       return loadTimeData.getStringF('foundSearchResults', numberOfItems, loadTimeData.getString(resultId), search);
     },
     cropItemTitle_: function(title) {
@@ skipping 228 matching lines @@
     }, 0);
   },
   needsTimeGap_: function(groupIndex, domainIndex, itemIndex) {
     var visits = this.groupedHistoryData_[groupIndex].domains[domainIndex].visits;
     return md_history.HistoryItem.needsTimeGap(visits, itemIndex, this.searchedTerm);
   },
   pathForItem_: function(groupIndex, domainIndex, itemIndex) {
     return [ 'groupedHistoryData_', groupIndex, 'domains', domainIndex, 'visits', itemIndex ].join('.');
   },
   getWebsiteIconStyle_: function(domain) {
-    return 'background-image: ' + cr.icon.getFaviconImageSet(domain.visits[0].url);
+    return 'background-image: ' + cr.icon.getFavicon(domain.visits[0].url);
   },
   getDropdownIcon_: function(expanded) {
     return expanded ? 'cr:expand-less' : 'cr:expand-more';
   }
 });
 
 (function() {
   var IOS = navigator.userAgent.match(/iP(?:hone|ad;(?: U;)? CPU) OS (\d+)/);
   var IOS_TOUCH_SCROLLING = IOS && IOS[1] >= 8;
   var DEFAULT_PHYSICAL_COUNT = 3;
@@ skipping 1233 matching lines @@
   toggleTabCard: function() {
     var histogramValue = this.$.collapse.opened ? SyncedTabsHistogram.COLLAPSE_SESSION : SyncedTabsHistogram.EXPAND_SESSION;
     md_history.BrowserService.getInstance().recordHistogram(SYNCED_TABS_HISTOGRAM_NAME, histogramValue, SyncedTabsHistogram.LIMIT);
     this.$.collapse.toggle();
     this.$['dropdown-indicator'].icon = this.$.collapse.opened ? 'cr:expand-less' : 'cr:expand-more';
   },
   updateIcons_: function() {
     this.async(function() {
       var icons = Polymer.dom(this.root).querySelectorAll('.website-icon');
       for (var i = 0; i < this.tabs.length; i++) {
-        icons[i].style.backgroundImage = cr.icon.getFaviconImageSet(this.tabs[i].url);
+        icons[i].style.backgroundImage = cr.icon.getFavicon(this.tabs[i].url);
       }
     });
   },
   isWindowSeparatorIndex_: function(index, separatorIndexes) {
     return this.separatorIndexes.indexOf(index) != -1;
   },
   getCollapseIcon_: function(opened) {
     return opened ? 'cr:expand-less' : 'cr:expand-more';
   },
   getCollapseTitle_: function(opened) {
@@ skipping 429 matching lines @@
 
        case HistoryRange.MONTH:
         histogramValue = HistoryPageViewHistogram.GROUPED_MONTH;
         break;
       }
       break;
     }
     md_history.BrowserService.getInstance().recordHistogram('History.HistoryPageView', histogramValue, HistoryPageViewHistogram.END);
   }
 });