Revert 277797 "Refactor tool-bar event handlers."

trunk/src/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}
-   * @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('toggle-full-screen'));
 
   window.addEventListener('mousemove', remoting.Toolbar.onMouseMove, false);
   window.addEventListener('resize', this.center.bind(this), false);
 
   registerEventListener('new-connection', 'click',
       function() {
         chrome.app.window.create('main.html', { 'width': 800, 'height': 600 });
       });
+  registerEventListener('send-ctrl-alt-del', 'click', remoting.sendCtrlAltDel);
+  registerEventListener('send-print-screen', 'click', remoting.sendPrintScreen);
+  registerEventListener('sign-out', 'click', remoting.signOut);
   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_);
@@ skipping 31 matching lines @@
 };
 
 /**
  * Toggle the tool-bar visibility.
  */
 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.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.
  * @param {number} y The y co-ordinate.
  * @return {boolean} True if the position should activate the tool-bar stub, or
  *     false otherwise.
  * @private
  */
 remoting.Toolbar.prototype.hitTest_ = function(x, y) {
@@ skipping 25 matching lines @@
   }
 };
 
 /** @type {remoting.Toolbar} */
 remoting.toolbar = null;
 
 /** @private */
 remoting.Toolbar.STUB_EXTENDED_CLASS_ = 'toolbar-stub-extended';
 /** @private */
 remoting.Toolbar.VISIBLE_CLASS_ = 'toolbar-visible';