NTP5: Apps regression fix.

chrome/browser/resources/ntp_search/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. NewTabView manages page list,
  * dot list and handles apps pages callbacks from backend. It also handles
  * the layout of the Bottom Panel and the global UI states of the New Tab Page.
  */
@@ skipping 464 matching lines @@
      *     be highlighted.
      */
     appAdded: function(data, opt_highlight) {
       assert(loadTimeData.getBoolean('showApps'));
 
       if (data.id == this.highlightAppId) {
         opt_highlight = true;
         this.highlightAppId = null;
       }
 
-      var pageIndex = data.page_index || 0;
+      if (!this.appsLoaded_)
+        opt_highlight = false;
 
       var app = $(data.id);
       if (app) {
         app.replaceAppData(data);
       } else if (opt_highlight) {
         this.appsPage.insertAndHighlightApp(data);
         this.setShownPage_(loadTimeData.getInteger('apps_page_id'),
                            data.page_index);
       } else {
         this.appsPage.insertApp(data, false);
       }
     },
 
     /**
      * Callback invoked by chrome whenever an app preference changes.
      * @param {Object} data An object with all the data on available
      *     applications.
      */
     appsPrefChangedCallback: function(data) {
       assert(loadTimeData.getBoolean('showApps'));
 
       for (var i = 0; i < data.apps.length; ++i) {
-        $(data.apps[i].id).data = data.apps[i];
+        var element = $(data.apps[i].id);
+        if (element)
+          element.data = data.apps[i];
       }
     },
 
     /**
      * Invoked whenever the pages in page-list have changed so that the
      * CardSlider knows about the new elements.
      */
     updateSliderCards: function() {
       var pageNo = Math.max(0, Math.min(this.cardSlider.currentCard,
                                         this.tilePages.length - 1));
@@ skipping 267 matching lines @@
      */
     showBottomPanel_: function(show) {
       $('bottom-panel').classList.toggle('hide-bottom-panel', !show);
     },
   };
 
   /**
    * Invoked at startup once the DOM is available to initialize the app.
    */
   function onLoad() {
+
+    if (!loadTimeData.getBoolean('showApps'))
+      cr.dispatchSimpleEvent(document, 'sectionready', true, true);
+
     // Load the current theme colors.
     themeChanged();
 
     newTabView = new NewTabView();
 
     bottomPanelOffsetTop = $('bottom-panel').offsetTop;
     headerHeight = $('bottom-panel-header').offsetHeight;
 
     notificationContainer = getRequiredElement('notification-container');
 
@@ skipping 64 matching lines @@
       document.documentElement.classList.remove('starting-up');
 
       startTime = Date.now();
     });
   }
 
   /*
    * The number of sections to wait on.
    * @type {number}
    */
-  var sectionsToWaitFor = 1;
+  var sectionsToWaitFor = 2;
 
   /**
    * Queued callbacks which lie in wait for all sections to be ready.
    * @type {!Array}
    */
   var readyCallbacks = [];
 
   /**
    * Fired as each section of pages becomes ready.
    * @param {Event} e Each page's synthetic DOM event.
@@ skipping 234 matching lines @@
     setRecentlyClosedTabs: noop,
     showNotification: showNotification,
     themeChanged: themeChanged,
     updateLogin: noop,
   };
 });
 
 document.addEventListener('DOMContentLoaded', ntp.onLoad);
 
 var toCssPx = cr.ui.toCssPx;