ntp4: respect non-default apps promo logo

chrome/browser/resources/ntp4/apps_page.js

 // Copyright (c) 2011 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('ntp4', function() {
   'use strict';
 
   var localStrings = new LocalStrings;
 
   var APP_LAUNCH = {
@@ skipping 163 matching lines @@
 
     initialize: function() {
       assert(this.appData_.id, 'Got an app without an ID');
       this.id = this.appData_.id;
 
       this.className = 'app';
 
       var appContents = this.ownerDocument.createElement('div');
       appContents.className = 'app-contents';
 
+      var appImgContainer = this.ownerDocument.createElement('div');
+      appImgContainer.className = 'app-img-container';
+      this.appImgContainer_ = appImgContainer;
+
       if (!this.appData_.icon_big_exists && this.appData_.icon_small_exists)
         this.useSmallIcon_ = true;
 
       var appImg = this.ownerDocument.createElement('img');
       appImg.src = this.useSmallIcon_ ? this.appData_.icon_small :
                                         this.appData_.icon_big;
+      appImgContainer.appendChild(appImg);
+
       if (this.useSmallIcon_) {
         var imgDiv = this.ownerDocument.createElement('div');
         imgDiv.className = 'app-icon-div';
-        imgDiv.appendChild(appImg);
+        imgDiv.appendChild(appImgContainer);
         imgDiv.addEventListener('click', this.onClick_.bind(this));
         this.imgDiv_ = imgDiv;
         appContents.appendChild(imgDiv);
       } else {
-        appImg.addEventListener('click', this.onClick_.bind(this));
-        appContents.appendChild(appImg);
+        appImgContainer.addEventListener('click', this.onClick_.bind(this));
+        appContents.appendChild(appImgContainer);
       }
       this.appImg_ = appImg;
 
       var appSpan = this.ownerDocument.createElement('span');
       appSpan.textContent = this.appData_.name;
       appSpan.addEventListener('click', this.onClick_.bind(this));
       appContents.appendChild(appSpan);
       this.appendChild(appContents);
+      this.appContents_ = appContents;
 
       this.addEventListener('keydown', cr.ui.contextMenuHandler);
       this.addEventListener('keyup', cr.ui.contextMenuHandler);
 
       // This hack is here so that appContents.contextMenu will be the same as
       // this.contextMenu.
       var self = this;
       appContents.__defineGetter__('contextMenu', function() {
         return self.contextMenu;
       });
@@ skipping 14 matching lines @@
 
       this.appsPromoExtras_ = $('apps-promo-extras-template').cloneNode(true);
       this.appsPromoExtras_.id = '';
       this.appsPromoHeading_ =
           this.appsPromoExtras_.querySelector('.apps-promo-heading');
       this.appsPromoLink_ =
           this.appsPromoExtras_.querySelector('.apps-promo-link');
       this.appsPromoHide_ =
           this.appsPromoExtras_.querySelector('.apps-promo-hide');
 
+      this.appsPromoLogo_ = this.ownerDocument.createElement('img');
+      this.appsPromoLogo_.className = 'apps-promo-logo';
+      this.appImgContainer_.appendChild(this.appsPromoLogo_);
+
       this.appsPromoHide_.addEventListener('click',
                                            this.onHidePromoClicked_.bind(this));
 
       this.appendChild(this.appsPromoExtras_);
       this.appsPromoExtras_.hidden = false;
-      // TODO(estade): A ping url needs to be set for the app icon.
     },
 
     /**
      * Handles when the "No, thanks" promo link is clicked.
      * @private
      */
     onHidePromoClicked_: function(e) {
       chrome.send('hideAppsPromo');
       this.setAppsPromoData(null);
     },
 
     /**
      * Sets the apps promo appearance. If |data| is null, there is no promo. If
      * |data| is non-null, it contains strings to be shown for the promo. The
      * promo is only shown when the webstore app icon is alone on a page.
      * @param {Object} data A dictionary that contains apps promo strings.
      */
     setAppsPromoData: function(data) {
       if (data) {
         this.classList.add('has-promo');
       } else {
         this.classList.remove('has-promo');
         return;
       }
 
       this.appsPromoHeading_.textContent = data.promoHeader;
       this.appsPromoLink_.href = data.promoLink;
       this.appsPromoLink_.textContent = data.promoButton;
       this.appsPromoHide_.textContent = data.promoExpire;
+      this.appsPromoLogo_.src = data.promoLogo;
     },
 
     /**
      * 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.appImg_.style.width = this.appImg_.style.height =
+      this.appImgContainer_.style.width = this.appImgContainer_.style.height =
           this.useSmallIcon_ ? '32px' : imgSize + 'px';
 
-
       this.style.width = this.style.height = size + 'px';
       if (this.isStore_)
         this.appsPromoExtras_.style.left = size + (imgSize - size) / 2 + 'px';
 
       this.style.left = x + 'px';
       this.style.right = x + 'px';
       this.style.top = y + 'px';
     },
 
     /**
@@ skipping 202 matching lines @@
     var store = document.querySelector('.webstore');
     if (store)
       store.setAppsPromoData(data);
   };
 
   return {
     APP_LAUNCH: APP_LAUNCH,
     AppsPage: AppsPage,
   };
 });