Revert of Gallery: Add toolbar at the top of window.

ui/file_manager/gallery/js/gallery.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.
 
 /**
  * Overrided metadata worker's path.
  * @type {string}
  */
 ContentMetadataProvider.WORKER_SCRIPT = '/js/metadata_worker.js';
 
@@ skipping 78 matching lines @@
   // Initializes the UI.
 
   // Initialize the dialog label.
   cr.ui.dialogs.BaseDialog.OK_LABEL = str('GALLERY_OK_LABEL');
   cr.ui.dialogs.BaseDialog.CANCEL_LABEL = str('GALLERY_CANCEL_LABEL');
 
   var content = queryRequiredElement(document, '#content');
   content.addEventListener('click', this.onContentClick_.bind(this));
 
   this.header_ = queryRequiredElement(document, '#header');
-  this.topToolbar_ = queryRequiredElement(document, '#top-toolbar');
-  this.bottomToolbar_ = queryRequiredElement(document, '#bottom-toolbar');
+  this.toolbar_ = queryRequiredElement(document, '#toolbar');
 
   var preventDefault = function(event) { event.preventDefault(); };
 
   var minimizeButton = util.createChild(this.header_,
                                         'minimize-button tool dimmable',
                                         'button');
   minimizeButton.tabIndex = -1;
   minimizeButton.addEventListener('click', this.onMinimize_.bind(this));
   minimizeButton.addEventListener('mousedown', preventDefault);
 
   var maximizeButton = util.createChild(this.header_,
                                         'maximize-button tool dimmable',
                                         'button');
   maximizeButton.tabIndex = -1;
   maximizeButton.addEventListener('click', this.onMaximize_.bind(this));
   maximizeButton.addEventListener('mousedown', preventDefault);
 
   var closeButton = util.createChild(this.header_,
                                      'close-button tool dimmable',
                                      'button');
   closeButton.tabIndex = -1;
   closeButton.addEventListener('click', this.onClose_.bind(this));
   closeButton.addEventListener('mousedown', preventDefault);
 
-  this.filenameSpacer_ = queryRequiredElement(this.topToolbar_,
+  this.filenameSpacer_ = queryRequiredElement(this.toolbar_,
       '.filename-spacer');
   this.filenameEdit_ = util.createChild(this.filenameSpacer_,
                                         'namebox', 'input');
 
   this.filenameEdit_.setAttribute('type', 'text');
   this.filenameEdit_.addEventListener('blur',
       this.onFilenameEditBlur_.bind(this));
 
   this.filenameEdit_.addEventListener('focus',
       this.onFilenameFocus_.bind(this));
 
   this.filenameEdit_.addEventListener('keydown',
       this.onFilenameEditKeydown_.bind(this));
 
-  var middleSpacer = queryRequiredElement(this.bottomToolbar_,
-      '.middle-spacer');
-  var buttonSpacer = queryRequiredElement(this.topToolbar_, '.button-spacer');
+  var middleSpacer = queryRequiredElement(this.toolbar_, '.middle-spacer');
+  var buttonSpacer = queryRequiredElement(this.toolbar_, '.button-spacer');
 
   this.prompt_ = new ImageEditor.Prompt(this.container_, strf);
 
   this.errorBanner_ = new ErrorBanner(this.container_);
 
-  this.modeButton_ = queryRequiredElement(this.topToolbar_, 'button.mode');
+  this.modeButton_ = queryRequiredElement(this.toolbar_, 'button.mode');
   this.modeButton_.addEventListener('click',
       this.toggleMode_.bind(this, undefined));
 
   this.mosaicMode_ = new MosaicMode(content,
                                     this.errorBanner_,
                                     this.dataModel_,
                                     this.selectionModel_,
                                     this.volumeManager_,
                                     this.toggleMode_.bind(this, undefined));
 
   this.slideMode_ = new SlideMode(this.container_,
                                   content,
-                                  this.topToolbar_,
-                                  this.bottomToolbar_,
+                                  this.toolbar_,
                                   this.prompt_,
                                   this.errorBanner_,
                                   this.dataModel_,
                                   this.selectionModel_,
                                   this.metadataModel_,
                                   this.thumbnailModel_,
                                   this.context_,
                                   this.volumeManager_,
                                   this.toggleMode_.bind(this),
                                   str);
@@ skipping 95 matching lines @@
 
 /**
  * Initializes a toolbar button.
  *
  * @param {string} className Class to add.
  * @param {string} title Button title.
  * @return {!HTMLElement} Newly created button.
  * @private
  */
 Gallery.prototype.initToolbarButton_ = function(className, title) {
-  var button = queryRequiredElement(this.topToolbar_, 'button.' + className);
+  var button = queryRequiredElement(this.toolbar_, 'button.' + className);
   button.title = str(title);
   return button;
 };
 
 /**
  * Loads the content.
  *
  * @param {!Array<!Entry>} selectedEntries Array of selected entries.
  */
 Gallery.prototype.load = function(selectedEntries) {
@@ skipping 236 matching lines @@
     mosaic.transform(
         tileRect, this.slideMode_.getSelectedImageRect(), true /* instant */);
     this.slideMode_.leave(
         tileRect,
         function() {
           // Animate back to normal position.
           mosaic.transform(null, null);
           mosaic.show();
           onModeChanged();
         }.bind(this));
-    this.bottomToolbar_.hidden = true;
   } else {
     this.setCurrentMode_(this.slideMode_);
     this.slideMode_.enter(
         tileRect,
         function() {
           // Animate to zoomed position.
           mosaic.transform(tileRect, this.slideMode_.getSelectedImageRect());
           mosaic.hide();
         }.bind(this),
         onModeChanged);
-    this.bottomToolbar_.hidden = false;
   }
 };
 
 /**
  * Deletes the selected items.
  * @private
  */
 Gallery.prototype.delete_ = function() {
   this.onUserAction_();
 
@@ skipping 389 matching lines @@
 initializePromise.then(reload);
 
 /**
  * Enteres the debug mode.
  */
 window.debugMe = function() {
   initializePromise.then(function() {
     gallery.debugMe();
   });
 };