retry r123804 - ntp theme fixes

chrome/browser/resources/ntp4/new_tab.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.
 
 /**
  * @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 243 matching lines @@
     var pxWidth = Math.max(measuringDiv.clientWidth * 1.15, 80);
 
     var styleElement = document.createElement('style');
     styleElement.type = 'text/css';
     // max-width is used because if we run out of space, the nav dots will be
     // shrunk.
     styleElement.textContent = '.dot { max-width: ' + pxWidth + 'px; }';
     document.querySelector('head').appendChild(styleElement);
   }
 
-  // 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);
+  function themeChanged(opt_hasAttribution) {
+    $('themecss').href = 'chrome://theme/css/new_tab_theme.css?' + Date.now();
+
+    if (typeof opt_hasAttribution != 'undefined') {
+      document.documentElement.setAttribute('hasattribution',
+                                            opt_hasAttribution);
+    }
+
     updateLogo();
     updateAttribution();
   }
 
+  function setBookmarkBarAttached(attached) {
+    document.documentElement.setAttribute('bookmarkbarattached', attached);
+  }
+
   /**
    * Sets the proper image for the logo at the bottom left.
    */
   function updateLogo() {
     var imageId = 'IDR_PRODUCT_LOGO';
     if (document.documentElement.getAttribute('customlogo') == 'true')
       imageId = 'IDR_CUSTOM_PRODUCT_LOGO';
 
     $('logo-img').src = 'chrome://theme/' + imageId + '?' + Date.now();
   }
@@ skipping 249 matching lines @@
     appRemoved: appRemoved,
     appsPrefChangeCallback: appsPrefChangeCallback,
     enterRearrangeMode: enterRearrangeMode,
     getAppsCallback: getAppsCallback,
     getAppsPageIndex: getAppsPageIndex,
     getCardSlider: getCardSlider,
     onLoad: onLoad,
     leaveRearrangeMode: leaveRearrangeMode,
     saveAppPageName: saveAppPageName,
     setAppToBeHighlighted: setAppToBeHighlighted,
+    setBookmarkBarAttached: setBookmarkBarAttached,
     setMostVisitedPages: setMostVisitedPages,
     setRecentlyClosedTabs: setRecentlyClosedTabs,
     setStripeColor: setStripeColor,
     showNotification: showNotification,
     themeChanged: themeChanged,
     updateLogin: updateLogin
   };
 });
 
 // publish ntp globals
 // TODO(estade): update the content handlers to use ntp namespace instead of
 // making these global.
 var getAppsCallback = ntp4.getAppsCallback;
 var appsPrefChangeCallback = ntp4.appsPrefChangeCallback;
 var themeChanged = ntp4.themeChanged;
 var recentlyClosedTabs = ntp4.setRecentlyClosedTabs;
 var setMostVisitedPages = ntp4.setMostVisitedPages;
 var updateLogin = ntp4.updateLogin;
 
 document.addEventListener('DOMContentLoaded', ntp4.onLoad);