ntp4: Make theme attribution separate from chrome logo.

chrome/browser/resources/ntp4/new_tab.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.
 
 /**
  * @fileoverview New tab page
  * This is the main code for the new tab page used by touch-enabled Chrome
  * browsers.  For now this is still a prototype.
  */
 
@@ skipping 662 matching lines @@
     }, DEFAULT_TRANSITION_TIME);
 
     updateSliderCards();
   }
 
   // TODO(estade): rename newtab.css to new_tab_theme.css
   function themeChanged(hasAttribution) {
     $('themecss').href = 'chrome://theme/css/newtab.css?' + Date.now();
     if (typeof hasAttribution != 'undefined')
       document.documentElement.setAttribute('hasattribution', hasAttribution);
+    updateLogo();
     updateAttribution();
   }
 
   /**
    * Sets the proper image for the logo at the bottom left.
    */
-  function updateAttribution() {
-    // Default value for standard NTP with no theme attribution or custom logo.
+  function updateLogo() {
     var imageId = 'IDR_PRODUCT_LOGO';
-    // Theme attribution always overrides custom logos.
-    if (document.documentElement.getAttribute('hasattribution') == 'true')
-      imageId = 'IDR_THEME_NTP_ATTRIBUTION';
-    else if (document.documentElement.getAttribute('customlogo') == 'true')
+    if (document.documentElement.getAttribute('customlogo') == 'true')
       imageId = 'IDR_CUSTOM_PRODUCT_LOGO';
 
-    $('attribution-img').src = 'chrome://theme/' + imageId + '?' + Date.now();
+    $('logo-img').src = 'chrome://theme/' + imageId + '?' + Date.now();
+  }
+
+  /**
+   * Attributes the attribution image at the bottom left.
+   */
+  function updateAttribution() {
+    var attribution = $('attribution');
+    if (document.documentElement.getAttribute('hasattribution') == 'true') {
+      $('attribution-img').src =
+          'chrome://theme/IDR_THEME_NTP_ATTRIBUTION?' + Date.now();
+      attribution.hidden = false;
+    } else {
+      attribution.hidden = true;
+    }
+
   }
 
   function setRecentlyClosedTabs(dataItems) {
     $('recently-closed-menu-button').dataItems = dataItems;
   }
 
   function setMostVisitedPages(data, firstRun, hasBlacklistedUrls) {
     mostVisitedPage.data = data;
   }
 
@@ skipping 13 matching lines @@
 // TODO(estade): update the content handlers to use ntp namespace instead of
 // making these global.
 var assert = ntp4.assert;
 var getAppsCallback = ntp4.getAppsCallback;
 var appsPrefChangeCallback = ntp4.appsPrefChangeCallback;
 var themeChanged = ntp4.themeChanged;
 var recentlyClosedTabs = ntp4.setRecentlyClosedTabs;
 var setMostVisitedPages = ntp4.setMostVisitedPages;
 
 document.addEventListener('DOMContentLoaded', ntp4.initialize);