Revert of Move overwrite original checkbox and saved label to bottom toolbar.

ui/file_manager/gallery/js/slide_mode.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.
 
 /**
  * Slide mode displays a single image and has a set of controls to navigate
  * between the images and to edit an image.
  *
  * @param {!HTMLElement} container Main container element.
  * @param {!HTMLElement} content Content container element.
@@ skipping 208 matching lines @@
   this.imageContainer_.addEventListener('click', this.onClick_.bind(this));
 
   this.document_.addEventListener('click', this.onDocumentClick_.bind(this));
 
   /**
    * Overwrite options and info bubble.
    * @type {!HTMLElement}
    * @private
    * @const
    */
-  this.options_ = queryRequiredElement(this.bottomToolbar_, '.options');
+  this.options_ = util.createChild(queryRequiredElement(
+      this.topToolbar_, '.filename-spacer'), 'options');
 
   /**
    * @type {!HTMLElement}
    * @private
    * @const
    */
-  this.savedLabel_ = queryRequiredElement(this.options_, '.saved');
+  this.savedLabel_ = util.createChild(this.options_, 'saved');
+  this.savedLabel_.textContent = this.displayStringFunction_('GALLERY_SAVED');
 
   /**
    * @type {!HTMLElement}
    * @private
    * @const
    */
-  this.overwriteOriginalBox_ = queryRequiredElement(
-      this.options_, '.overwrite-original');
+  this.overwriteOriginalBox_ = util.createChild(
+      this.options_, 'overwrite-original');
 
   /**
    * @type {!HTMLElement}
    * @private
    * @const
    */
-  this.overwriteOriginal_ = queryRequiredElement(
-      this.overwriteOriginalBox_, '#overwrite-checkbox')
+  this.overwriteOriginal_ = util.createChild(
+      this.overwriteOriginalBox_, '', 'input');
+  this.overwriteOriginal_.type = 'checkbox';
+  this.overwriteOriginal_.id = 'overwrite-checkbox';
   chrome.storage.local.get(SlideMode.OVERWRITE_KEY, function(values) {
     var value = values[SlideMode.OVERWRITE_KEY];
     // Out-of-the box default is 'true'
     this.overwriteOriginal_.checked =
         (value === 'false' || value === false) ? false : true;
   }.bind(this));
   this.overwriteOriginal_.addEventListener('click',
       this.onOverwriteOriginalClick_.bind(this));
 
   /**
    * @type {!HTMLElement}
+   * @const
+   */
+  var overwriteLabel = util.createChild(
+      this.overwriteOriginalBox_, '', 'label');
+  overwriteLabel.textContent =
+      this.displayStringFunction_('GALLERY_OVERWRITE_ORIGINAL');
+  overwriteLabel.setAttribute('for', 'overwrite-checkbox');
+
+  /**
+   * @type {!HTMLElement}
    * @private
    * @const
    */
   this.bubble_ = util.createChild(this.bottomToolbar_, 'bubble');
   this.bubble_.hidden = true;
 
   /**
    * @type {!HTMLElement}
    * @const
    */
@@ skipping 1582 matching lines @@
   var event = assertInstanceof(event, MouseEvent);
   var viewport = this.slideMode_.getViewport();
   if (!this.enabled_ || !viewport.isZoomed())
     return;
   this.stopOperation();
   viewport.setOffset(
       viewport.getOffsetX() + event.wheelDeltaX,
       viewport.getOffsetY() + event.wheelDeltaY);
   this.slideMode_.applyViewportChange();
 };