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

remoting/webapp/remoting.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.
 
 'use strict';
 
 /** @suppress {duplicate} */
 var remoting = remoting || {};
 
 /** @type {remoting.HostSession} */ remoting.hostSession = null;
@@ skipping 43 matching lines @@
   // Create global objects.
   remoting.ClientPlugin.factory = new remoting.DefaultClientPluginFactory();
   remoting.SessionConnector.factory =
       new remoting.DefaultSessionConnectorFactory();
   remoting.settings = new remoting.Settings();
   if (base.isAppsV2()) {
     remoting.identity = new remoting.Identity(consentRequired_);
     remoting.fullscreen = new remoting.FullscreenAppsV2();
     remoting.windowFrame = new remoting.WindowFrame(
         document.getElementById('title-bar'));
+    remoting.optionsMenu = remoting.windowFrame.createOptionsMenu();
   } else {
     remoting.oauth2 = new remoting.OAuth2();
     if (!remoting.oauth2.isAuthenticated()) {
       document.getElementById('auth-dialog').hidden = false;
     }
     remoting.identity = remoting.oauth2;
     remoting.fullscreen = new remoting.FullscreenAppsV1();
+    remoting.toolbar = new remoting.Toolbar(
+        document.getElementById('session-toolbar'));
+    remoting.optionsMenu = remoting.toolbar.createOptionsMenu();
   }
   remoting.stats = new remoting.ConnectionStats(
       document.getElementById('statistics'));
   remoting.formatIq = new remoting.FormatIq();
   remoting.hostList = new remoting.HostList(
       document.getElementById('host-list'),
       document.getElementById('host-list-empty'),
       document.getElementById('host-list-error-message'),
       document.getElementById('host-list-refresh-failed-button'),
       document.getElementById('host-list-loading-indicator'));
-  remoting.toolbar = new remoting.Toolbar(
-      document.getElementById('session-toolbar'));
   remoting.clipboard = new remoting.Clipboard();
   var sandbox = /** @type {HTMLIFrameElement} */
       document.getElementById('wcs-sandbox');
   remoting.wcsSandbox = new remoting.WcsSandboxContainer(sandbox.contentWindow);
   var homeFeedback = new remoting.MenuButton(
       document.getElementById('help-feedback-main'));
   var toolbarFeedback = new remoting.MenuButton(
       document.getElementById('help-feedback-toolbar'));
   remoting.manageHelpAndFeedback(
       document.getElementById('title-bar'));
@@ skipping 494 matching lines @@
 }
 
 /**
  * Tests whether we are running on ChromeOS.
  *
  * @return {boolean} True if the platform is ChromeOS.
  */
 remoting.platformIsChromeOS = function() {
   return navigator.userAgent.match(/\bCrOS\b/) != null;
 }