Add a sign-in promo message to the Other Devices menu.

chrome/browser/resources/ntp4/other_sessions.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 The menu that shows tabs from sessions on other devices.
  */
 
 cr.define('ntp', function() {
   'use strict';
 
   var localStrings = new LocalStrings();
   var Menu = cr.ui.Menu;
   var MenuItem = cr.ui.MenuItem;
   var MenuButton = cr.ui.MenuButton;
   var OtherSessionsMenuButton = cr.ui.define('button');
 
   // Histogram buckets for UMA tracking of menu usage.
   var HISTOGRAM_EVENT = {
       INITIALIZED: 0,
       SHOW_MENU: 1,
       LINK_CLICKED: 2,
       LINK_RIGHT_CLICKED: 3
   };
   var HISTOGRAM_EVENT_LIMIT = HISTOGRAM_EVENT.LINK_RIGHT_CLICKED + 1;
 
+  var isUserSignedIn = false;
+
   OtherSessionsMenuButton.prototype = {
     __proto__: MenuButton.prototype,
 
     decorate: function() {
       MenuButton.prototype.decorate.call(this);
       this.menu = new Menu;
       cr.ui.decorate(this.menu, Menu);
       this.menu.classList.add('footer-menu');
       this.menu.addEventListener('contextmenu',
                                  this.onContextMenu_.bind(this), true);
       document.body.appendChild(this.menu);
 
+      // Put the promo content (hidden by default) into the menu.
+      var messageContent = $('other-sessions-promo-message');
+      messageContent.parentNode.removeChild(messageContent);
+      this.menu.appendChild(messageContent);

[Dan Beam, 2012/03/26 17:08:34]

I think appendChild() will implicitly remove the node from the DOM anyways... so
you probably don't need to removeChild() it first.

[Patrick Dubroy, 2012/03/26 19:36:46]

Done.

+
       this.sessions_ = [];
       this.anchorType = cr.ui.AnchorType.ABOVE;
       this.invertLeftRight = true;
 
-      chrome.send('getForeignSessions');
       this.recordUmaEvent_(HISTOGRAM_EVENT.INITIALIZED);
+      this.classList.remove('invisible');
     },
 
     /**
+     * Initialize the menu.

[Dan Beam, 2012/03/26 17:08:34]

may want to be more specific of which menu or just remove this comment

[Patrick Dubroy, 2012/03/26 19:36:46]

Done.

+     * @param {boolean} signedIn Is the current user signed in?
+     * @param {function} signInCallback A function to open the sign-in UI.
+     */
+    initialize: function(signedIn, signInCallback) {
+      var promo = $('other-sessions-promo-message');

[Dan Beam, 2012/03/26 17:08:34]

nit: why not document.querySelector('#other-sessions-promo-message .link-span')
and is this always there?

[Patrick Dubroy, 2012/03/26 19:36:46]

This code is gone.

+      promo.querySelector('.link-span').addEventListener('click',
+                                                         signInCallback);
+
+      // Always show the promo, because getForeignSessions can be a no-op.
+      this.showPromo_();
+      if (signedIn)
+        chrome.send('getForeignSessions');

[Dan Beam, 2012/03/26 17:08:34]

replace this code with:
  
  this.updateSignInState_(signedIn);

[Patrick Dubroy, 2012/03/26 19:36:46]

Done.

+    },
+
+    /**
      * Record an event in the UMA histogram.
      * @param {Number} eventId The id of the event to be recorded.
      */
     recordUmaEvent_: function(eventId) {
       chrome.send('metricsHandler:recordInHistogram',
           ['NewTabPage.OtherSessionsMenu', eventId, HISTOGRAM_EVENT_LIMIT]);
     },
 
     /**
      * Handle a context menu event for an object in the menu's DOM subtree.
@@ skipping 11 matching lines @@
      * @override
      */
     showMenu: function() {
       if (this.sessions_.length == 0)
         chrome.send('getForeignSessions');
       this.recordUmaEvent_(HISTOGRAM_EVENT.SHOW_MENU);
       MenuButton.prototype.showMenu.call(this);
     },
 
     /**
+     * Reset the menu to the default state.
+     */
+    resetMenu_: function() {
+      var promoContent = $('other-sessions-promo-message');
+      this.menu.innerHTML = '';
+      this.menu.appendChild(promoContent);
+      promoContent.hidden = true;
+    },
+
+    /**
      * Create a custom click handler for a link, so that clicking on a link
      * restores the session (including back stack) rather than just opening
      * the URL.
      */
     makeClickHandler_: function(sessionTag, windowId, tabId) {
       var self = this;
       return function(e) {
         self.recordUmaEvent_(HISTOGRAM_EVENT.LINK_CLICKED);
         chrome.send('openForeignSession', [sessionTag, windowId, tabId,
             e.button, e.altKey, e.ctrlKey, e.metaKey, e.shiftKey]);
@@ skipping 26 matching lines @@
           a.style.backgroundImage = 'url(chrome://favicon/' + tab.url + ')';
           var clickHandler = this.makeClickHandler_(
               session.tag, String(window.sessionId), String(tab.sessionId));
           a.addEventListener('click', clickHandler);
           section.appendChild(a);
         }
       }
     },
 
     /**
-     * Create the UI for the promo and place it inside the menu.
-     * The promo is shown instead of foreign session data when tab sync is
-     * not enabled for a profile.
+     * Show a promo message inside the menu.
+     * The promo is shown when there is no foreign session data available.
      */
     showPromo_: function() {
-      var message = localStrings.getString('otherSessionsEmpty');
-      this.menu.appendChild(this.ownerDocument.createTextNode(message));
+      this.resetMenu_();
+      $('other-sessions-promo-message').hidden = false;

[Dan Beam, 2012/03/26 17:08:34]

nit: you seem to do this a couple times (toggle this node's hidden state),
personally I'd change to:

  /**
   * Show or hide the other sessions promo message based on |visible|.
   * @param {boolean} visible Whether the message should be shown.
   */
  setOtherSessionsPromoHidden_: function(visible) {
    $('other-sessions-promo-message').hidden = !visible;
  },

or something to that effect, but that's up to you (I like to update code in as
little places as possible)

[Patrick Dubroy, 2012/03/26 19:36:46]

Done.

     },
 
     /**
      * Sets the menu model data.
      * @param {Array} sessionList Array of objects describing the sessions
      * from other devices.

[Dan Beam, 2012/03/26 17:08:34]

nit: +4\s before from

[Patrick Dubroy, 2012/03/26 19:36:46]

Done.

      */
     set sessions(sessionList) {
-      // Clear the current contents of the menu.
-      this.menu.innerHTML = '';
+      this.sessions_ = sessionList;
+      if (sessionList.length == 0) {
+        this.showPromo_();
+      } else {
+        this.resetMenu_();
 
-      // Rebuild the menu with the new data.
-      for (var i = 0; i < sessionList.length; i++) {
-        this.addSession_(sessionList[i]);
+        // Rebuild the menu with the new data.
+        for (var i = 0; i < sessionList.length; i++) {
+          this.addSession_(sessionList[i]);
+        }
+        $('other-sessions-promo-message').hidden = true;

[Dan Beam, 2012/03/26 17:08:34]

this .hidden = true; seems redundant now that it's done in resetMenu_(), eh?

[Patrick Dubroy, 2012/03/26 19:36:46]

Done.

       }
+    },
 
-      if (sessionList.length == 0)
-        this.classList.add('invisible');
-      else
-        this.classList.remove('invisible');
-
-      this.sessions_ = sessionList;
+    /**
+     * Called from the new tab page when the user's signed in state changes.
+     * @param {boolean} signedIn Is the user currently signed in?
+     */
+    updateSignInState: function(signedIn) {
+      // Always show the promo, because getForeignSessions can be a no-op.
+      this.showPromo_();
+      if (signedIn)
+        chrome.send('getForeignSessions');
     },
   };
 
   return {
     OtherSessionsMenuButton: OtherSessionsMenuButton,
   };
 });