Fix layout glitches in NTP. Also, lots of naming cleanup.

chrome/browser/resources/ntp/apps.js

 // Copyright (c) 2010 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.
 
 var MAX_APPS_PER_ROW = [];
 MAX_APPS_PER_ROW[LayoutMode.SMALL] = 4;
 MAX_APPS_PER_ROW[LayoutMode.NORMAL] = 6;
 
 // The URL prefix used in the app link 'ping' attributes.
 var PING_APP_LAUNCH_PREFIX = 'record-app-launch';
@@ skipping 48 matching lines @@
     addClosedMenuEntryWithLink(apps.menu, apps.createClosedMenuElement(app));
   });
   if (data.apps.length < MAX_MINIVIEW_ITEMS) {
     webStoreMiniEntry = apps.createWebStoreMiniElement();
     webStoreEntry.querySelector('a').setAttribute('ping', appsPromoPing);
     appsMiniview.appendChild(webStoreMiniEntry);
     addClosedMenuEntryWithLink(apps.menu,
                                apps.createWebStoreClosedMenuElement());
   }
 
-  if (!data.showLauncher || (shownSections & MINIMIZED_APPS)) {
+  if (!data.showLauncher)
     appsSection.classList.add('disabled');
-  } else {
+  else
     appsSection.classList.remove('disabled');
-  }
-  addClosedMenuFooter(apps.menu, 'apps', MINIMIZED_APPS, Section.APPS);
+
+  addClosedMenuFooter(apps.menu, 'apps', MENU_APPS, Section.APPS);
 
   apps.loaded = true;
   if (apps.showPromo)
     document.documentElement.classList.add('apps-promo-visible');
   else
     document.documentElement.classList.remove('apps-promo-visible');
 
   var appsPromoLink = $('apps-promo-link');
   if (appsPromoLink)
     appsPromoLink.setAttribute('ping', appsPromoPing);
@@ skipping 29 matching lines @@
     a.setAttribute('app-id', app['id']);
     a.setAttribute('launch-type', app['launch_type']);
     a.xtitle = a.textContent = app['name'];
     a.href = app['launch_url'];
 
     return div;
   }
 
   function launchApp(appId) {
     var appsSection = $('apps');
-    var expanded = !appsSection.classList.contains('hidden');
+    var expanded = !appsSection.classList.contains('collapsed');
     var element = document.querySelector(
         (expanded ? '.maxiview' : '.miniview') + ' a[app-id=' + appId + ']');
 
     // TODO(arv): Handle zoom?
     var rect = element.getBoundingClientRect();
     var cs = getComputedStyle(element);
     var size = cs.backgroundSize.split(/\s+/);  // background-size has the
                                                 // format '123px 456px'.
 
     var width = parseInt(size[0], 10);
@@ skipping 222 matching lines @@
     createWebStoreClosedMenuElement: function() {
       var a = document.createElement('a');
       a.textContent = localStrings.getString('web_store_title');
       a.href = localStrings.getString('web_store_url');
       a.style.backgroundImage = url('chrome://theme/IDR_PRODUCT_LOGO_16');
       a.className = 'item';
       return a;
     }
   };
 })();