Add a minimum offset for the OOP PDF toolbar

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">
 
 /**
  * @return {number} Width of a scrollbar in pixels
  */
 function getScrollbarWidth() {
   var div = document.createElement('div');
   div.style.visibility = 'hidden';
   div.style.overflow = 'scroll';
   div.style.width = '50px';
   div.style.height = '50px';
   div.style.position = 'absolute';
   document.body.appendChild(div);
   var result = div.offsetWidth - div.clientWidth;
   div.parentNode.removeChild(div);
   return result;
 }
 
 /**
+ * The minimum number of pixels to offset the toolbar by from the bottom and
+ * right side of the screen.
+ */
+PDFViewer.MIN_TOOLBAR_OFFSET = 15;
+
+/**
  * Creates a new PDFViewer. There should only be one of these objects per
  * document.
  */
 function PDFViewer() {
   // The sizer element is placed behind the plugin element to cause scrollbars
   // to be displayed in the window. It is sized according to the document size
   // of the pdf and zoom level.
   this.sizer_ = $('sizer');
   this.toolbar_ = $('toolbar');
   this.pageIndicator_ = $('page-indicator');
@@ skipping 266 matching lines @@
     if (this.viewport_.fittingType == Viewport.FittingType.FIT_TO_PAGE) {
       $('fit-to-page-button').classList.add('polymer-selected');
     } else if (this.viewport_.fittingType ==
                Viewport.FittingType.FIT_TO_WIDTH) {
       $('fit-to-width-button').classList.add('polymer-selected');
     }
 
     var hasScrollbars = this.viewport_.documentHasScrollbars();
     var scrollbarWidth = this.viewport_.scrollbarWidth;
     // Offset the toolbar position so that it doesn't move if scrollbars appear.
-    var toolbarRight = hasScrollbars.vertical ? 0 : scrollbarWidth;
-    var toolbarBottom = hasScrollbars.horizontal ? 0 : scrollbarWidth;
+    var toolbarRight = Math.max(PDFViewer.MIN_TOOLBAR_OFFSET, scrollbarWidth);
+    var toolbarBottom = Math.max(PDFViewer.MIN_TOOLBAR_OFFSET, scrollbarWidth);
+    if (hasScrollbars.vertical)
+      toolbarRight -= scrollbarWidth;
+    if (hasScrollbars.horizontal)
+      toolbarBottom -= scrollbarWidth;
     this.toolbar_.style.right = toolbarRight + 'px';
     this.toolbar_.style.bottom = toolbarBottom + 'px';
 
     // Update the page indicator.
     var visiblePage = this.viewport_.getMostVisiblePage();
     this.pageIndicator_.index = visiblePage;
     if (this.documentDimensions_.pageDimensions.length > 1 &&
         hasScrollbars.vertical) {
       this.pageIndicator_.style.visibility = 'visible';
     } else {
@@ skipping 81 matching lines @@
 
   /**
    * @type {Viewport} the viewport of the PDF viewer.
    */
   get viewport() {
     return this.viewport_;
   }
 };
 
 var viewer = new PDFViewer();