Revert 283225 "Hookup the PDF extension to the chrome extensions..."

trunk/src/chrome/browser/resources/pdf/pdf.js

 // Copyright 2013 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';
 
 <include src="../../../../ui/webui/resources/js/util.js">
 <include src="pdf_scripting_api.js">
 <include src="viewport.js">
 
@@ skipping 116 matching lines @@
       this.viewport_.fitToPage.bind(this.viewport_));
   $('zoom-in-button').addEventListener('click',
       this.viewport_.zoomIn.bind(this.viewport_));
   $('zoom-out-button').addEventListener('click',
       this.viewport_.zoomOut.bind(this.viewport_));
   $('save-button-link').href = this.streamDetails.originalUrl;
   $('print-button').addEventListener('click', this.print_.bind(this));
 
   // Setup the keyboard event listener.
   document.onkeydown = this.handleKeyEvent_.bind(this);
-
-  // Set up the zoom API.
-  chrome.tabs.setZoomSettings({mode: 'manual', scope: 'per-tab'},
-                              this.afterZoom_.bind(this));
-  chrome.tabs.onZoomChange.addListener(function(zoomChangeInfo) {
-    // If the zoom level is close enough to the current zoom level, don't change
-    // it. This avoids us getting into an infinite loop of zoom changes to to
-    // floating point error.
-    var MIN_ZOOM_DELTA = 0.01;
-    var zoomDelta = Math.abs(this.viewport_.zoom -
-                             zoomChangeInfo.newZoomFactor);
-    if (zoomDelta > MIN_ZOOM_DELTA)
-      this.viewport_.setZoom(zoomChangeInfo.newZoomFactor);
-  }.bind(this));
 }
 
 PDFViewer.prototype = {
   /**
    * @private
    * Handle key events. These may come from the user directly or via the
    * scripting API.
    * @param {KeyboardEvent} e the event to handle.
    */
   handleKeyEvent_: function(e) {
@@ skipping 51 matching lines @@
           position.x += Viewport.SCROLL_INCREMENT;
           this.viewport.position = position;
         }
         return;
       case 40:  // Down arrow key.
         if (fromScriptingAPI) {
           position.y += Viewport.SCROLL_INCREMENT;
           this.viewport.position = position;
         }
         return;
+      case 187:  // +/= key.
+      case 107:  // Numpad + key.
+        if (e.ctrlKey || e.metaKey) {
+          this.viewport_.zoomIn();
+          // Since we do the zooming of the page.
+          e.preventDefault();
+        }
+        return;
+      case 189:  // -/_ key.
+      case 109:  // Numpad - key.
+        if (e.ctrlKey || e.metaKey) {
+          this.viewport_.zoomOut();
+          // Since we do the zooming of the page.
+          e.preventDefault();
+        }
+        return;
       case 83:  // s key.
         if (e.ctrlKey || e.metaKey) {
           // Simulate a click on the button so that the <a download ...>
           // attribute is used.
           $('save-button-link').click();
           // Since we do the saving of the page.
           e.preventDefault();
         }
         return;
       case 80:  // p key.
@@ skipping 140 matching lines @@
   },
 
   /**
    * @private
    * A callback that's called after the zoom changes. Notify the plugin of the
    * zoom change and to continue reacting to scroll events.
    */
   afterZoom_: function() {
     var position = this.viewport_.position;
     var zoom = this.viewport_.zoom;
-    if (!this.setZoomInProgress_) {
-      this.setZoomInProgress_ = true;
-      chrome.tabs.setZoom(zoom, this.setZoomComplete_.bind(this, zoom));
-    }
     this.plugin_.postMessage({
       type: 'viewport',
       zoom: zoom,
       xOffset: position.x,
       yOffset: position.y
     });
   },
 
   /**
    * @private
-   * A callback that's called after chrome.tabs.setZoom is complete. This will
-   * call chrome.tabs.setZoom again if the zoom level has changed since it was
-   * last called.
-   * @param {number} lastZoom the zoom level that chrome.tabs.setZoom was called
-   *     with.
-   */
-  setZoomComplete_: function(lastZoom) {
-    var zoom = this.viewport_.zoom;
-    if (zoom != lastZoom)
-      chrome.tabs.setZoom(zoom, this.setZoomComplete_.bind(this, zoom));
-    else
-      this.setZoomInProgress_ = false;
-  },
-
-  /**
-   * @private
    * A callback that's called after the viewport changes.
    */
   viewportChanged_: function() {
     if (!this.documentDimensions_)
       return;
 
     // Update the buttons selected.
     $('fit-to-page-button').classList.remove('polymer-selected');
     $('fit-to-width-button').classList.remove('polymer-selected');
     if (this.viewport_.fittingType == Viewport.FittingType.FIT_TO_PAGE) {
@@ skipping 102 matching lines @@
 
   /**
    * @type {Viewport} the viewport of the PDF viewer.
    */
   get viewport() {
     return this.viewport_;
   }
 };
 
 var viewer = new PDFViewer();