ntp4: improved app install, try 2

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 119 matching lines @@
     themeChanged();
 
     dotList = getRequiredElement('dot-list');
     pageList = getRequiredElement('page-list');
     trash = getRequiredElement('trash');
     new ntp4.Trash(trash);
 
     shownPage = templateData['shown_page_type'];
     shownPageIndex = templateData['shown_page_index'];
 
-    // When a new app has been installed, we will be opened with a hash value
-    // that corresponds to the new app ID.
-    highlightAppId = getAndClearAppIDHash();
-
     // Request data on the apps so we can fill them in.
     // Note that this is kicked off asynchronously.  'getAppsCallback' will be
     // invoked at some point after this function returns.
     chrome.send('getApps');
 
     // Prevent touch events from triggering any sort of native scrolling
     document.addEventListener('touchmove', function(e) {
       e.preventDefault();
     }, true);
 
@@ skipping 73 matching lines @@
    * @param {string} id The identifier name.
    * @return {!Element} the Element.
    */
   function getRequiredElement(id) {
     var element = document.getElementById(id);
     assert(element, 'Missing required element: ' + id);
     return element;
   }
 
   /**
-   * Gets the app ID stored in the hash of the URL, and resets the hash to
-   * empty. If there is not an app-id in the hash, does nothing.
-   * @return {String} The value of the app-id query string parameter.
-   */
-  function getAndClearAppIDHash() {
-    var hash = location.hash;
-    if (hash.indexOf('#app-id=') == 0) {
-      var appID = hash.split('=')[1];
-      // Clear the hash so if the user bookmarks this page, they'll just get
-      // chrome://newtab/.
-      window.history.replaceState({}, '', '/');
-      return appID;
-    }
-    return '';
-  }
-
-  /**
    * Callback invoked by chrome with the apps available.
    *
    * Note that calls to this function can occur at any time, not just in
    * response to a getApps request. For example, when a user installs/uninstalls
    * an app on another synchronized devices.
    * @param {Object} data An object with all the data on available
    *        applications.
    */
   function getAppsCallback(data) {
     var startTime = Date.now();
@@ skipping 47 matching lines @@
         if (appsPages.length < pageNames.length)
           pageName = pageNames[appsPages.length];
 
         var origPageCount = appsPages.length;
         appendAppsPage(new ntp4.AppsPage(), pageName);
         // Confirm that appsPages is a live object, updated when a new page is
         // added (otherwise we'd have an infinite loop)
         assert(appsPages.length == origPageCount + 1, 'expected new page');
       }
 
-      if (app.id == highlightAppId) {
+      if (app.id == highlightAppId)
         highlightApp = app;
-        highlightAppId = null;
-      } else {
+      else
         appsPages[pageIndex].appendApp(app);
-      }
     }
 
     ntp4.AppsPage.setPromo(data.showPromo ? data : null);
 
     // Tell the slider about the pages.
     updateSliderCards();
 
     if (highlightApp)
       appAdded(highlightApp, true);
 
     // Mark the current page.
     cardSlider.currentCardValue.navigationDot.classList.add('selected');
     logEvent('apps.layout: ' + (Date.now() - startTime));
 
     document.documentElement.classList.remove('starting-up');
   }
 
   /**
    * Called by chrome when a new app has been added to chrome.
    * @param {Object} app A data structure full of relevant information for the
    *     app.
    */
   function appAdded(app, opt_highlight) {
-    // If the page is already open when a new app is installed, the hash will
-    // be set once again.
-    var appID = getAndClearAppIDHash();
-    if (appID == app.id)
+    if (app.id == highlightAppId) {
       opt_highlight = true;
+      highlightAppId = null;
+    }
 
     var pageIndex = app.page_index || 0;
 
     if (pageIndex >= appsPages.length) {
       while (pageIndex >= appsPages.length) {
         appendAppsPage(new ntp4.AppsPage(), '');
       }
       updateSliderCards();
     }
 
     var page = appsPages[pageIndex];
-    if (opt_highlight)
-      cardSlider.selectCardByValue(page);
-    page.appendApp(app, true);
+    page.appendApp(app, opt_highlight);
   }
 
   /**
+   * Sets that an app should be highlighted if it is added. Called right before
+   * appAdded for new installs.
+   */
+  function setAppToBeHighlighted(appId) {
+    highlightAppId = appId;
+  }
+
+  /**
    * Called by chrome when an existing app has been removed/uninstalled from
    * chrome.
    * @param {Object} appData A data structure full of relevant information for
    *     the app.
    */
   function appRemoved(appData) {
     var app = $(appData.id);
     assert(app, 'trying to remove an app that doesn\'t exist');
 
     var tile = findAncestorByClass(app, 'tile');
@@ skipping 386 matching lines @@
     appsPrefChangeCallback: appsPrefChangeCallback,
     assert: assert,
     enterRearrangeMode: enterRearrangeMode,
     getAppsCallback: getAppsCallback,
     getAppsPageIndex: getAppsPageIndex,
     getCardSlider: getCardSlider,
     initialize: initialize,
     isRTL: isRTL,
     leaveRearrangeMode: leaveRearrangeMode,
     saveAppPageName: saveAppPageName,
+    setAppToBeHighlighted: setAppToBeHighlighted,
     setBookmarksData: setBookmarksData,
     setMostVisitedPages: setMostVisitedPages,
     setRecentlyClosedTabs: setRecentlyClosedTabs,
     showNotification: showNotification,
     themeChanged: themeChanged
   };
 });
 
 // publish ntp globals
 // 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);