remoting.WindowShape clean up.

remoting/webapp/app_remoting/js/idle_detector.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
  * Class for detecting when the application is idle. Note that chrome.idle is
  * not suitable for this purpose because it detects when the computer is idle,
  * and we'd like to close the application and free up VM resources even if the
  * user has been using another application for a long time.
@@ skipping 36 matching lines @@
   this.resetTimeoutRef_ = null;
 
   var manifest = chrome.runtime.getManifest();
   var message = this.idleWarning_.querySelector('.idle-warning-message');
   l10n.localizeElement(message, manifest.name);
 
   var cont = this.idleWarning_.querySelector('.idle-dialog-continue');
   cont.addEventListener('click', this.onContinue_.bind(this), false);
   var quit = this.idleWarning_.querySelector('.idle-dialog-disconnect');
   quit.addEventListener('click', this.onDisconnect_.bind(this), false);
-
-  remoting.windowShape.addCallback(this);
   this.resetTimeout_();
 };
 
 /**
  * @param {boolean} register True to register the callbacks; false to remove
  *     them.
  * @private
  */
 remoting.IdleDetector.prototype.registerInputDetectionCallbacks_ =
     function(register) {
@@ skipping 64 matching lines @@
   }
   this.onDialogTimeout_();
 };
 
 /**
  * @param {boolean} show True to show the warning dialog; false to hide it.
  * @private
  */
 remoting.IdleDetector.prototype.showIdleWarning_ = function(show) {
   this.idleWarning_.hidden = !show;
-  remoting.windowShape.updateClientWindowShape();
-}
+  if (show) {
+    remoting.windowShape.registerClientUI(this);
+  } else {
+    remoting.windowShape.unregisterClientUI(this);
+  }
+};
 
 /**
  * @param {Array<{left: number, top: number, width: number, height: number}>}
  *     rects List of rectangles.
  */
 remoting.IdleDetector.prototype.addToRegion = function(rects) {
   if (!this.idleWarning_.hidden) {
     var dialog = this.idleWarning_.querySelector('.kd-modaldialog');
     var rect = /** @type {ClientRect} */ (dialog.getBoundingClientRect());
     rects.push(rect);
   }
 };
 
 // Time-out after 1hr of no activity.
 remoting.IdleDetector.kIdleTimeoutMs = 60 * 60 * 1000;
 
 // Show the idle warning dialog for 2 minutes.
 remoting.IdleDetector.kDialogTimeoutMs = 2 * 60 * 1000;