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

remoting/webapp/window_frame.js

 // Copyright 2014 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
  * Apps v2 custom title bar implementation
  */
 
 'use strict';
@@ skipping 12 matching lines @@
    */
   this.clientSession_ = null;
 
   /**
    * @type {HTMLElement}
    * @private
    */
   this.titleBar_ = titleBar;
 
   /**
-   * @type {remoting.OptionsMenu}
-   * @private
-   */
-  this.optionsMenu_ = new remoting.OptionsMenu(
-      titleBar.querySelector('.menu-send-ctrl-alt-del'),
-      titleBar.querySelector('.menu-send-print-screen'),
-      titleBar.querySelector('.menu-resize-to-client'),
-      titleBar.querySelector('.menu-shrink-to-fit'),
-      titleBar.querySelector('.menu-new-connection'),
-      titleBar.querySelector('.window-fullscreen'),
-      titleBar.querySelector('.menu-start-stop-recording'));
-
-  /**
    * @type {HTMLElement}
    * @private
    */
   this.title_ = /** @type {HTMLElement} */
       (titleBar.querySelector('.window-title'));
   base.debug.assert(this.title_ != null);
 
   /**
    * @type {HTMLElement}
    * @private
    */
   this.maximizeRestoreControl_ = /** @type {HTMLElement} */
       (titleBar.querySelector('.window-maximize-restore'));
   base.debug.assert(this.maximizeRestoreControl_ != null);
 
   var optionsButton = titleBar.querySelector('.window-options');
   base.debug.assert(optionsButton != null);
   this.optionMenuButton_ = new remoting.MenuButton(
       optionsButton,
       this.onShowOptionsMenu_.bind(this),
       this.onHideOptionsMenu_.bind(this));
 
   /**
    * @type {HTMLElement}
    * @private
    */
   this.optionsMenuList_ = /** @type {HTMLElement} */
       (optionsButton.querySelector('.window-options-menu'));
-  base.debug.assert(this.optionsMenu_ != null);
+  base.debug.assert(this.optionsMenuList_ != null);

[Jamie, 2014/09/22 18:20:04]

Unrelated typo fix. I can move this to a separate CL if you like.

 
   /**
    * @type {Array.<{cls:string, fn: function()}>}
    */
   var handlers = [
     { cls: 'window-disconnect', fn: this.disconnectSession_.bind(this) },
     { cls: 'window-maximize-restore',
       fn: this.maximizeOrRestoreWindow_.bind(this) },
     { cls: 'window-minimize', fn: this.minimizeWindow_.bind(this) },
     { cls: 'window-close', fn: window.close.bind(window) },
@@ skipping 11 matching lines @@
       this.handleWindowStateChange_.bind(this));
   chrome.app.window.current().onRestored.addListener(
       this.handleWindowStateChange_.bind(this));
   chrome.app.window.current().onFullscreened.addListener(
       this.handleWindowStateChange_.bind(this));
   chrome.app.window.current().onFullscreened.addListener(
       this.showWindowControlsPreview_.bind(this));
 };
 
 /**
+ * @return {remoting.OptionsMenu}
+ */
+remoting.WindowFrame.prototype.createOptionsMenu = function() {
+  return new remoting.OptionsMenu(
+      this.titleBar_.querySelector('.menu-send-ctrl-alt-del'),
+      this.titleBar_.querySelector('.menu-send-print-screen'),
+      this.titleBar_.querySelector('.menu-resize-to-client'),
+      this.titleBar_.querySelector('.menu-shrink-to-fit'),
+      this.titleBar_.querySelector('.menu-new-connection'),
+      this.titleBar_.querySelector('.window-fullscreen'),
+      this.titleBar_.querySelector('.menu-start-stop-recording'));
+};
+
+/**
  * @param {remoting.ClientSession} clientSession The client session, or null if
  *     there is no connection.
  */
 remoting.WindowFrame.prototype.setClientSession = function(clientSession) {
-  this.optionsMenu_.setClientSession(clientSession);
   this.clientSession_ = clientSession;
   var windowTitle = document.head.querySelector('title');
   if (this.clientSession_) {
     this.title_.innerText = clientSession.getHostDisplayName();
     windowTitle.innerText = clientSession.getHostDisplayName() + ' - ' +
         chrome.i18n.getMessage(/*i18n-content*/'PRODUCT_NAME');
   } else {
     this.title_.innerHTML = '&nbsp;';
     windowTitle.innerText =
         chrome.i18n.getMessage(/*i18n-content*/'PRODUCT_NAME');
@@ skipping 87 matching lines @@
   } else {
     this.optionsMenuList_.classList.remove('right-align');
   }
 };
 
 /**
  * Callback invoked when the options menu is shown.
  * @private
  */
 remoting.WindowFrame.prototype.onShowOptionsMenu_ = function() {
-  this.optionsMenu_.onShow();
+  remoting.optionsMenu.onShow();
   this.titleBar_.classList.add('menu-opened');
 };
 
 /**
  * Callback invoked when the options menu is shown.
  * @private
  */
 remoting.WindowFrame.prototype.onHideOptionsMenu_ = function() {
   this.titleBar_.classList.remove('menu-opened');
 };
@@ skipping 12 matching lines @@
   var hidePreview = function() {
     target.classList.remove('preview');
   };
   target.classList.add('preview');
   window.setTimeout(hidePreview, kPreviewTimeoutMs);
 };
 
 
 /** @type {remoting.WindowFrame} */
 remoting.windowFrame = null;