NTP Zombie Code Slayer Part IV: Most Visited

chrome/browser/resources/ntp4/page_list_view.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 PageListView implementation.
  * PageListView manages page list, dot list, switcher buttons and handles apps
  * pages callbacks from backend.
  *
  * Note that you need to have AppLauncherHandler in your WebUI to use this code.
@@ skipping 68 matching lines @@
      */
     tilePages: undefined,
 
     /**
      * A list of all 'apps-page' elements.
      * @type {!NodeList|undefined}
      */
     appsPages: undefined,
 
     /**
-     * The Most Visited page.
-     * @type {!Element|undefined}
-     */
-    mostVisitedPage: undefined,
-
-    /**
      * The 'dots-list' element.
      * @type {!Element|undefined}
      */
     dotList: undefined,
 
     /**
      * The left and right paging buttons.
      * @type {!ntp.PageSwitcher|undefined}
      */
     pageSwitcherStart: undefined,
@@ skipping 62 matching lines @@
       if (this.pageSwitcherStart)
         ntp.initializePageSwitcher(this.pageSwitcherStart);
 
       this.pageSwitcherEnd = opt_pageSwitcherEnd;
       if (this.pageSwitcherEnd)
         ntp.initializePageSwitcher(this.pageSwitcherEnd);
 
       this.shownPage = loadTimeData.getInteger('shown_page_type');
       this.shownPageIndex = loadTimeData.getInteger('shown_page_index');
 
-      if (loadTimeData.getBoolean('showApps')) {
-        // 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');
-      } else {
-        // No apps page.
-        if (this.shownPage == loadTimeData.getInteger('apps_page_id')) {
-          this.setShownPage_(
-              loadTimeData.getInteger('most_visited_page_id'), 0);
-        }
+      // TODO(dbeam): remove showApps and everything that says if (apps).
+      assert(loadTimeData.getBoolean('showApps'));

[xiyuan, 2015/05/18 20:29:12]

ChromeOS (and Win8 metro) does not show apps page because there is an ash app
list. Probably should keep the "if (apps)".

[Dan Beam, 2015/05/19 17:11:12]

nah, this code can't event run on ChromeOS.  ChromeOS-specific code is next up
on the chopping block.

https://code.google.com/p/chromium/codesearch#chromium/src/chrome/browser/ui/...

[xiyuan, 2015/05/19 17:13:01]

Okay. Thanks for double checking.

 
-        document.body.classList.add('bare-minimum');
-      }
+      // 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');
 
       document.addEventListener('keydown', this.onDocKeyDown_.bind(this));
 
       this.tilePages = this.pageList.getElementsByClassName('tile-page');
       this.appsPages = this.pageList.getElementsByClassName('apps-page');
 
       // Initialize the cardSlider without any cards at the moment.
       this.sliderFrame = cardSliderFrame;
       this.cardSlider = new cr.ui.CardSlider(this.sliderFrame, this.pageList,
           this.sliderFrame.offsetWidth);
@@ skipping 51 matching lines @@
      * the page list.
      */
     appendTilePage: function(page, title, titleIsEditable, opt_refNode) {
       if (opt_refNode) {
         var refIndex = this.getTilePageIndex(opt_refNode);
         this.cardSlider.addCardAtIndex(page, refIndex);
       } else {
         this.cardSlider.appendCard(page);
       }
 
-      // Remember special MostVisitedPage.
-      if (typeof ntp.MostVisitedPage != 'undefined' &&
-          page instanceof ntp.MostVisitedPage) {
-        assert(this.tilePages.length == 1,
-               'MostVisitedPage should be added as first tile page');
-        this.mostVisitedPage = page;
-      }
-
       // If we're appending an AppsPage and it's a temporary page, animate it.
       var animate = page instanceof ntp.AppsPage &&
                     page.classList.contains('temporary');
       // Make a deep copy of the dot template to add a new one.
       var newDot = new ntp.NavDot(page, title, titleIsEditable, animate);
       page.navigationDot = newDot;
       this.dotList.insertBefore(newDot,
                                 opt_refNode ? opt_refNode.navigationDot : null);
       // Set a tab index on the first dot.
       if (this.dotList.dots.length == 1)
@@ skipping 202 matching lines @@
      * @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).appData = data.apps[i];
       }
 
-      // Set the App dot names. Skip the first dot (Most Visited).
+      // Set the App dot names.
       var dots = this.dotList.getElementsByClassName('dot');
-      var start = this.mostVisitedPage ? 1 : 0;
-      for (var i = start; i < dots.length; ++i) {
+      for (var i = 0; i < dots.length; ++i) {
         dots[i].displayTitle = data.appPageNames[i - start] || '';
       }
     },
 
     /**
      * Callback invoked by chrome whenever the app launcher promo pref changes.
      * @param {boolean} show Identifies if we should show or hide the promo.
      */
     appLauncherPromoPrefChangeCallback: function(show) {
       loadTimeData.overrideValues({showAppLauncherPromo: show});
@@ skipping 12 matching lines @@
 
     /**
      * Invoked whenever the pages in apps-page-list have changed so that
      * the Slider knows about the new elements.
      */
     updateSliderCards: function() {
       var pageNo = Math.max(0, Math.min(this.cardSlider.currentCard,
                                         this.tilePages.length - 1));
       this.cardSlider.setCards(Array.prototype.slice.call(this.tilePages),
                                pageNo);
-      if (this.shownPage == loadTimeData.getInteger('most_visited_page_id')) {
-        if (this.mostVisitedPage)
-          this.cardSlider.selectCardByValue(this.mostVisitedPage);
-        else
-          this.shownPage = loadTimeData.getInteger('apps_page_id');
-      }
       if (this.shownPage == loadTimeData.getInteger('apps_page_id') &&
           loadTimeData.getBoolean('showApps')) {
         this.cardSlider.selectCardByValue(
             this.appsPages[Math.min(this.shownPageIndex,
                                     this.appsPages.length - 1)]);
-      } else if (this.mostVisitedPage) {
-        this.shownPage = loadTimeData.getInteger('most_visited_page_id');
-        this.cardSlider.selectCardByValue(this.mostVisitedPage);
       }
     },
 
     /**
      * Called whenever tiles should be re-arranging themselves out of the way
      * of a moving or insert tile.
      */
     enterRearrangeMode: function() {
       if (loadTimeData.getBoolean('showApps')) {
         var tempPage = new ntp.AppsPage();
@@ skipping 106 matching lines @@
      */
     onCardChanged_: function(e) {
       var page = e.cardSlider.currentCardValue;
 
       // Don't change shownPage until startup is done (and page changes actually
       // reflect user actions).
       if (!this.isStartingUp_()) {
         if (page.classList.contains('apps-page')) {
           this.setShownPage_(loadTimeData.getInteger('apps_page_id'),
                              this.getAppsPageIndex(page));
-        } else if (page.classList.contains('most-visited-page')) {
-          this.setShownPage_(
-              loadTimeData.getInteger('most_visited_page_id'), 0);
         } else {
           console.error('unknown page selected');
         }
       }
 
       // Update the active dot
       var curDot = this.dotList.getElementsByClassName('selected')[0];
       if (curDot)
         curDot.classList.remove('selected');
       page.navigationDot.classList.add('selected');
@@ skipping 130 matching lines @@
       if (page.navigationDot)
         page.navigationDot.remove(opt_animate);
       this.cardSlider.removeCard(page);
     },
   };
 
   return {
     PageListView: PageListView
   };
 });