OOP PDF: Add whether a resource is embedded to StreamInfo.

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';
 
 /**
  * @return {number} Width of a scrollbar in pixels
  */
 function getScrollbarWidth() {
@@ skipping 66 matching lines @@
 
   this.plugin_.setAttribute('src', this.streamDetails.originalUrl);
   this.plugin_.setAttribute('stream-url', this.streamDetails.streamUrl);
   var headers = '';
   for (var header in this.streamDetails.responseHeaders) {
     headers += header + ': ' +
         this.streamDetails.responseHeaders[header] + '\n';
   }
   this.plugin_.setAttribute('headers', headers);
 
-  if (window.top == window)
+  if (!this.streamDetails.embedded)
     this.plugin_.setAttribute('full-frame', '');
   document.body.appendChild(this.plugin_);
 
   // TODO(raymes): Remove this spurious message once crbug.com/388606 is fixed.
   // This is a hack to initialize pepper sync scripting and avoid re-entrancy.
   this.plugin_.postMessage({
     type: 'viewport',
     zoom: 1,
     xOffset: 0,
     yOffset: 0
   });
 
   // Setup the button event listeners.
   $('fit-to-width-button').addEventListener('click',
       this.viewport_.fitToWidth.bind(this.viewport_));
   $('fit-to-page-button').addEventListener('click',
       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.
-  if (chrome.tabs) {
+  if (this.shouldManageZoom_()) {
     chrome.tabs.setZoomSettings(this.streamDetails.tabId,
                                 {mode: 'manual', scope: 'per-tab'},
                                 this.afterZoom_.bind(this));
     chrome.tabs.onZoomChange.addListener(function(zoomChangeInfo) {
       if (zoomChangeInfo.tabId != this.streamDetails.tabId)
         return;
       // 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
       // due to floating point error.
       var MIN_ZOOM_DELTA = 0.01;
@@ skipping 288 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 (chrome.tabs && !this.setZoomInProgress_) {
+    if (this.shouldManageZoom_() && !this.setZoomInProgress_) {
       this.setZoomInProgress_ = true;
       chrome.tabs.setZoom(this.streamDetails.tabId, zoom,
                           this.setZoomComplete_.bind(this, zoom));
     }
     this.plugin_.postMessage({
       type: 'viewport',
       zoom: zoom,
       xOffset: position.x,
       yOffset: position.y
     });
@@ skipping 131 matching lines @@
    * @private
    * Send a scripting message outside the extension (typically to
    * PDFScriptingAPI in a page containing the extension).
    * @param {Object} message the message to send.
    */
   sendScriptingMessage_: function(message) {
     window.parent.postMessage(message, '*');
   },
 
   /**
+   * @private
+   * Return whether this PDFViewer should manage zoom for its containing page.
+   * @return {boolean} Whether this PDFViewer should manage zoom for its
+   *     containing page.
+   */
+  shouldManageZoom_: function() {
+    return !!(chrome.tabs && !this.streamDetails.embedded &&
+              this.streamDetails.tabId != -1);
+  },
+
+  /**
    * @type {Viewport} the viewport of the PDF viewer.
    */
   get viewport() {
     return this.viewport_;
   }
 };