Move ownership of the tool-bar's menu buttons into remoting.Toolbar.

remoting/webapp/toolbar.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
  * Class representing the client tool-bar.
  */
 
 'use strict';
@@ skipping 24 matching lines @@
   /**
    * @type {number} The left edge of the tool-bar stub, updated on resize.
    * @private
    */
   this.stubLeft_ = 0;
   /**
    * @type {number} The right edge of the tool-bar stub, updated on resize.
    * @private
    */
   this.stubRight_ = 0;
+
   /**
-   * @type {remoting.OptionsMenu}
+   * @type {remoting.MenuButton}
    * @private
    */
-  this.optionsMenu_ = new remoting.OptionsMenu(
-      document.getElementById('send-ctrl-alt-del'),
-      document.getElementById('send-print-screen'),
-      document.getElementById('screen-resize-to-client'),
-      document.getElementById('screen-shrink-to-fit'),
-      document.getElementById('new-connection'),
-      document.getElementById('toggle-full-screen'),
-      null);
+  this.screenOptionsMenu_ = new remoting.MenuButton(
+      document.getElementById('screen-options-menu'),
+      this.onShowOptionsMenu_.bind(this));
+  /**
+   * @type {remoting.MenuButton}
+   * @private
+   */
+  this.sendKeysMenu_ = new remoting.MenuButton(
+      document.getElementById('send-keys-menu')
+  );
+
 
   window.addEventListener('mousemove', remoting.Toolbar.onMouseMove, false);
   window.addEventListener('resize', this.center.bind(this), false);
 
   registerEventListener('toolbar-disconnect', 'click', remoting.disconnect);
   registerEventListener('toolbar-stub', 'click',
       function() { remoting.toolbar.toggle(); });
 
   // Prevent the preview canceling if the user is interacting with the tool-bar.
   /** @type {remoting.Toolbar} */
   var that = this;
   var stopTimer = function() {
     if (that.timerId_) {
       window.clearTimeout(that.timerId_);
       that.timerId_ = null;
     }
   }
   this.toolbar_.addEventListener('mousemove', stopTimer, false);
 };
 
+
+/**
+ * @return {remoting.OptionsMenu}
+ */
+remoting.Toolbar.prototype.createOptionsMenu = function() {
+  return new remoting.OptionsMenu(
+      document.getElementById('send-ctrl-alt-del'),
+      document.getElementById('send-print-screen'),
+      document.getElementById('screen-resize-to-client'),
+      document.getElementById('screen-shrink-to-fit'),
+      document.getElementById('new-connection'),
+      document.getElementById('toggle-full-screen'),
+      null);
+};
+
 /**
  * Preview the tool-bar functionality by showing it for 3s.
  * @return {void} Nothing.
  */
 remoting.Toolbar.prototype.preview = function() {
   this.toolbar_.classList.add(remoting.Toolbar.VISIBLE_CLASS_);
   if (this.timerId_) {
     window.clearTimeout(this.timerId_);
     this.timerId_ = null;
   }
@@ skipping 19 matching lines @@
  */
 remoting.Toolbar.prototype.toggle = function() {
   this.toolbar_.classList.toggle(remoting.Toolbar.VISIBLE_CLASS_);
 };
 
 /**
  * @param {remoting.ClientSession} clientSession The active session, or null if
  *     there is no connection.
  */
 remoting.Toolbar.prototype.setClientSession = function(clientSession) {
-  this.optionsMenu_.setClientSession(clientSession);
   var connectedTo = document.getElementById('connected-to');
   connectedTo.innerText =
       clientSession ? clientSession.getHostDisplayName() : "";
 };
 
 /**
  * Test the specified co-ordinate to see if it is close enough to the stub
  * to activate it.
  *
  * @param {number} x The x co-ordinate.
@@ skipping 24 matching lines @@
       toolbarStub.classList.add(remoting.Toolbar.STUB_EXTENDED_CLASS_);
     } else {
       toolbarStub.classList.remove(remoting.Toolbar.STUB_EXTENDED_CLASS_);
     }
   } else {
     document.removeEventListener('mousemove',
                                  remoting.Toolbar.onMouseMove, false);
   }
 };
 
+/**
+ * Updates the options menu to reflect the current scale-to-fit and full-screen
+ * settings.
+ * @return {void} Nothing.
+ * @private
+ */
+remoting.Toolbar.prototype.onShowOptionsMenu_ = function() {
+  remoting.optionsMenu.onShow();
+};
+
 /** @type {remoting.Toolbar} */
 remoting.toolbar = null;
 
 /** @private */
 remoting.Toolbar.STUB_EXTENDED_CLASS_ = 'toolbar-stub-extended';
 /** @private */
 remoting.Toolbar.VISIBLE_CLASS_ = 'toolbar-visible';