Make some updates to extension iconography.

chrome/browser/resources/ntp4/apps_page.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.
 
 cr.define('ntp', function() {
   'use strict';
 
   var APP_LAUNCH = {
     // The histogram buckets (keep in sync with extension_constants.h).
     NTP_APPS_MAXIMIZED: 0,
@@ skipping 227 matching lines @@
      * @param {Object} appData The data object that describes the app.
      */
     initialize: function(appData) {
       this.appData = appData;
       assert(this.appData_.id, 'Got an app without an ID');
       this.id = this.appData_.id;
       this.setAttribute('role', 'menuitem');
 
       this.className = 'app focusable';
 
-      if (!this.appData_.icon_big_exists && this.appData_.icon_small_exists)
-        this.useSmallIcon_ = true;
-
-      this.appContents_ = this.useSmallIcon_ ?
-          $('app-small-icon-template').cloneNode(true) :
-          $('app-large-icon-template').cloneNode(true);
+      this.appContents_ = $('app-icon-template').cloneNode(true);
       this.appContents_.id = '';
       this.appendChild(this.appContents_);
 
       this.appImgContainer_ = /** @type {HTMLElement} */(
           this.querySelector('.app-img-container'));
       this.appImg_ = this.appImgContainer_.querySelector('img');
       this.setIcon();
 
-      if (this.useSmallIcon_) {
-        this.imgDiv_ = /** @type {HTMLElement} */(
-            this.querySelector('.app-icon-div'));
-        this.addLaunchClickTarget_(this.imgDiv_);
-        this.imgDiv_.title = this.appData_.full_name;
-        chrome.send('getAppIconDominantColor', [this.id]);
-      } else {
-        this.addLaunchClickTarget_(this.appImgContainer_);
-        this.appImgContainer_.title = this.appData_.full_name;
-      }
+      this.addLaunchClickTarget_(this.appImgContainer_);
+      this.appImgContainer_.title = this.appData_.full_name;
 
       // The app's full name is shown in the tooltip, whereas the short name
       // is used for the label.
       var appSpan = /** @type {HTMLElement} */(
           this.appContents_.querySelector('.title'));
       appSpan.textContent = this.appData_.title;
       appSpan.title = this.appData_.full_name;
       this.addLaunchClickTarget_(appSpan);
 
       this.addEventListener('keydown', cr.ui.contextMenuHandler);
@@ skipping 10 matching lines @@
         this.appContents_.addEventListener('contextmenu',
                                            cr.ui.contextMenuHandler);
       }
 
       this.addEventListener('mousedown', this.onMousedown_, true);
       this.addEventListener('keydown', this.onKeydown_);
       this.addEventListener('blur', this.onBlur_);
     },
 
     /**
-     * Sets the color of the favicon dominant color bar.
-     * @param {string} color The css-parsable value for the color.
-     */
-    set stripeColor(color) {
-      this.querySelector('.color-stripe').style.backgroundColor = color;
-    },
-
-    /**
      * Removes the app tile from the page. Should be called after the app has
      * been uninstalled.
      *
      * TODO(dbeam): this method now conflicts with HTMLElement#remove(), which
      * is why the param is optional. Rename.
      *
      * @param {boolean=} opt_animate Whether the removal should be animated.
      */
     remove: function(opt_animate) {
       // Unset the ID immediately, because the app is already gone. But leave
       // the tile on the page as it animates out.
       this.id = '';
       this.tile.doRemove(opt_animate);
     },
 
     /**
      * Set the URL of the icon from |appData_|. This won't actually show the
      * icon until loadIcon() is called (for performance reasons; we don't want
      * to load icons until we have to).
      */
     setIcon: function() {
-      var src = this.useSmallIcon_ ? this.appData_.icon_small :
-                                     this.appData_.icon_big;
+      var src = this.appData_.icon;
       if (!this.appData_.enabled ||
           (!this.appData_.offlineEnabled && !navigator.onLine)) {
         src += '?grayscale=true';
       }
 
       this.appImgSrc_ = src;
       this.classList.add('icon-loading');
     },
 
     /**
@@ skipping 13 matching lines @@
     /**
      * Set the size and position of the app tile.
      * @param {number} size The total size of |this|.
      * @param {number} x The x-position.
      * @param {number} y The y-position.
      *     animate.
      */
     setBounds: function(size, x, y) {
       var imgSize = size * APP_IMG_SIZE_FRACTION;
       this.appImgContainer_.style.width = this.appImgContainer_.style.height =
-          toCssPx(this.useSmallIcon_ ? 16 : imgSize);
-      if (this.useSmallIcon_) {
-        // 3/4 is the ratio of 96px to 128px (the used height and full height
-        // of icons in apps).
-        var iconSize = imgSize * 3 / 4;
-        // The -2 is for the div border to improve the visual alignment for the
-        // icon div.
-        this.imgDiv_.style.width = this.imgDiv_.style.height =
-            toCssPx(iconSize - 2);
-        // Margins set to get the icon placement right and the text to line up.
-        this.imgDiv_.style.marginTop = this.imgDiv_.style.marginBottom =
-            toCssPx((imgSize - iconSize) / 2);
-      }
-
+          toCssPx(imgSize);
       this.style.width = this.style.height = toCssPx(size);
       this.style.left = toCssPx(x);
       this.style.right = toCssPx(x);
       this.style.top = toCssPx(y);
     },
 
     onBlur_: function(e) {
       this.classList.remove('click-focus');
       this.appContents_.classList.remove('suppress-active');
     },
 
     /**
      * Invoked when an app is clicked.
      * @param {Event} e The click/auxclick event.
      * @private
      */
     onClick_: function(e) {
-      if (/** @type {MouseEvent} */(e).button > 1) return;
+      if (/** @type {MouseEvent} */(e).button > 1)
+        return;
 
       chrome.send('launchApp',
                   [this.appId, APP_LAUNCH.NTP_APPS_MAXIMIZED, 'chrome-ntp-icon',
                    e.button, e.altKey, e.ctrlKey, e.metaKey, e.shiftKey]);
 
       // Don't allow the click to trigger a link or anything
       e.preventDefault();
     },
 
     /**
@@ skipping 58 matching lines @@
     replaceAppData: function(appData) {
       this.appData_ = appData;
       this.setIcon();
       this.loadIcon();
     },
 
     /**
      * The data and preferences for this app.
      * @type {Object}
      */
-    set appData(data) {
-      this.appData_ = data;
-    },
-    get appData() {
-      return this.appData_;
-    },
+    set appData(data) { this.appData_ = data; },
+    get appData() { return this.appData_; },
 
-    get appId() {
-      return this.appData_.id;
-    },
+    get appId() { return this.appData_.id; },
 
     /**
      * Returns a pointer to the context menu for this app. All apps share the
      * singleton AppContextMenu. This function is called by the
      * ContextMenuHandler in response to the 'contextmenu' event.
      * @type {cr.ui.Menu}
      */
     get contextMenu() {
       var menu = AppContextMenu.getInstance();
       menu.setupForApp(this);
       return menu.menu;
     },
 
     /**
      * Returns whether this element can be 'removed' from chrome (i.e. whether
      * the user can drag it onto the trash and expect something to happen).
      * @return {boolean} True if the app can be uninstalled.
      */
-    canBeRemoved: function() {
-      return this.appData_.mayDisable;
-    },
+    canBeRemoved: function() { return this.appData_.mayDisable; },
 
     /**
      * Uninstalls the app after it's been dropped on the trash.
      */
     removeFromChrome: function() {
       chrome.send('uninstallApp', [this.appData_.id, true]);
       this.tile.tilePage.removeTile(this.tile, true);
     },
 
     /**
@@ skipping 252 matching lines @@
     chrome.send('launchApp', [appId, APP_LAUNCH.NTP_APP_RE_ENABLE]);
   }
 
   return {
     APP_LAUNCH: APP_LAUNCH,
     App: App,
     AppsPage: AppsPage,
     launchAppAfterEnable: launchAppAfterEnable,
   };
 });