Material WebUI: create shared icon file.

chrome/browser/resources/md_downloads/crisper.js

 // Copyright (c) 2013 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.
 
 /**
  * @fileoverview Assertion support.
  */
 
 /**
  * Verify |condition| is truthy and return |condition| if so.
@@ skipping 1450 matching lines @@
  */
 function appendParam(url, key, value) {
   var param = encodeURIComponent(key) + '=' + encodeURIComponent(value);
 
   if (url.indexOf('?') == -1)
     return url + '?' + param;
   return url + '&' + param;
 }
 
 /**
+ * A regular expression for identifying favicon URLs.
+ * @const {!RegExp}
+ * TODO(dpapad): Move all favicon related methods to a new favicon_util.js file
+ * and make this RegExp private.
+ */
+var FAVICON_URL_REGEX = /\.ico$/i;
+
+/**
  * Creates a CSS -webkit-image-set for a favicon request.
- * @param {string} url The url for the favicon.
+ * @param {string} url Either the URL of the original page or of the favicon
+ *     itself.
  * @param {number=} opt_size Optional preferred size of the favicon.
  * @param {string=} opt_type Optional type of favicon to request. Valid values
  *     are 'favicon' and 'touch-icon'. Default is 'favicon'.
  * @return {string} -webkit-image-set for the favicon.
  */
 function getFaviconImageSet(url, opt_size, opt_type) {
   var size = opt_size || 16;
   var type = opt_type || 'favicon';
+
   return imageset(
-      'chrome://' + type + '/size/' + size + '@scalefactorx/' + url);
+      'chrome://' + type + '/size/' + size + '@scalefactorx/' +
+      // Note: Literal 'iconurl' must match |kIconURLParameter| in
+      // components/favicon_base/favicon_url_parser.cc.
+      (FAVICON_URL_REGEX.test(url) ? 'iconurl/' : '') + url);
 }
 
 /**
- * Creates a new URL for a favicon request for the current device pixel ratio.
- * The URL must be updated when the user moves the browser to a screen with a
- * different device pixel ratio. Use getFaviconImageSet() for the updating to
- * occur automatically.
- * @param {string} url The url for the favicon.
- * @param {number=} opt_size Optional preferred size of the favicon.
- * @param {string=} opt_type Optional type of favicon to request. Valid values
- *     are 'favicon' and 'touch-icon'. Default is 'favicon'.
- * @return {string} Updated URL for the favicon.
- */
-function getFaviconUrlForCurrentDevicePixelRatio(url, opt_size, opt_type) {
-  var size = opt_size || 16;
-  var type = opt_type || 'favicon';
-  return 'chrome://' + type + '/size/' + size + '@' +
-      window.devicePixelRatio + 'x/' + url;
-}
-
-/**
  * Creates an element of a specified type with a specified class name.
  * @param {string} type The node type.
  * @param {string} className The class name to use.
  * @return {Element} The created element.
  */
 function createElementWithClassName(type, className) {
   var elm = document.createElement(type);
   elm.className = className;
   return elm;
 }
@@ skipping 9862 matching lines @@
     Manager.get().updateItem_(index, data);
   };
 
   return {Manager: Manager};
 });
 // 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.
 
 window.addEventListener('load', downloads.Manager.onLoad);