NTP5: Fix page blacklisting and remove recently closed tabs when they're clicked. Fix the styling …

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 used by touch-enabled Chrome
  * browsers.  For now this is still a prototype.
  */
 
@@ skipping 308 matching lines @@
     function closeFunc(e) {
       if (opt_closeHandler)
         opt_closeHandler();
       hideNotification();
     }
 
     document.querySelector('#notification button').onclick = closeFunc;
     document.addEventListener('dragstart', closeFunc);
 
     notificationContainer.hidden = false;
-    showNotificationOnCurrentPage();
+    window.setTimeout(function() {

[pedro (no code reviews), 2012/09/06 00:28:49]

Do you really need this inside a setTimeout?

[jeremycho, 2012/09/06 04:40:08]

Without it, the fade-in transition isn't seen.

+      notificationContainer.classList.remove('inactive');
+    }, 0);
 
     newTabView.cardSlider.frame.addEventListener(
         'cardSlider:card_change_ended', onCardChangeEnded);
 
     var timeout = opt_timeout || 10000;
     notificationTimeout = window.setTimeout(hideNotification, timeout);
   }
 
   /**
    * Hide the notification bubble.
    */
   function hideNotification() {
     notificationContainer.classList.add('inactive');
 
     newTabView.cardSlider.frame.removeEventListener(
         'cardSlider:card_change_ended', onCardChangeEnded);
   }
 
   /**
    * Happens when 1 or more consecutive card changes end.
    * @param {Event} e The cardSlider:card_change_ended event.
    */
   function onCardChangeEnded(e) {
     // If we ended on the same page as we started, ignore.
     if (newTabView.cardSlider.currentCardValue.notification)
       return;
 
-    // Hide the notification the old page.
+    // Fade the notification out then in whenever the card has changed.
+    // TODO(jeremycho): Add card-changed as soon as the dot is clicked?
     notificationContainer.classList.add('card-changed');
-
-    showNotificationOnCurrentPage();
+    window.setTimeout(function() {
+      notificationContainer.classList.remove('card-changed');
+    }, 0);
   }
 
   /**
-   * Move and show the notification on the current page.
-   */
-  function showNotificationOnCurrentPage() {
-    var page = newTabView.cardSlider.currentCardValue;
-    doWhenAllSectionsReady(function() {
-      if (page != newTabView.cardSlider.currentCardValue)
-        return;
-
-      // NOTE: This moves the notification to inside of the current page.
-      page.notification = notificationContainer;
-
-      // Reveal the notification and instruct it to hide itself if ignored.
-      notificationContainer.classList.remove('inactive');
-
-      // Gives the browser time to apply this rule before we remove it (causing
-      // a transition).
-      window.setTimeout(function() {
-        notificationContainer.classList.remove('card-changed');
-      }, 0);
-    });
-  }
-
-  /**
    * When done fading out, set hidden to true so the notification can't be
    * tabbed to or clicked.
    * @param {Event} e The webkitTransitionEnd event.
    */
   function onNotificationTransitionEnd(e) {
     if (notificationContainer.classList.contains('inactive'))
       notificationContainer.hidden = true;
   }
 
   function setRecentlyClosedTabs(data) {
-    newTabView.recentlyClosedPage.data = data;
+    newTabView.recentlyClosedPage.setData(data);
   }
 
   function setMostVisitedPages(data, hasBlacklistedUrls) {
-    newTabView.mostVisitedPage.data = data;
+    newTabView.mostVisitedPage.setData(data);
     cr.dispatchSimpleEvent(document, 'sectionready', true, true);
   }
 
   function setSuggestionsPages(data, hasBlacklistedUrls) {
     newTabView.suggestionsPage.data = data;
   }
 
   function getThumbnailUrl(url) {
     return 'chrome://thumb/' + url;
   }
@@ skipping 111 matching lines @@
     setRecentlyClosedTabs: setRecentlyClosedTabs,
     showNotification: showNotification,
     themeChanged: themeChanged,
     updateLogin: updateLogin
   };
 });
 
 document.addEventListener('DOMContentLoaded', ntp.onLoad);
 
 var toCssPx = cr.ui.toCssPx;