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

ui/file_manager/gallery/js/gallery.js

Index: ui/file_manager/gallery/js/gallery.js
diff --git a/ui/file_manager/gallery/js/gallery.js b/ui/file_manager/gallery/js/gallery.js
index 39ad2d3765dcd9df3544f30ff303a86fce35d358..d769d246cf6917d18e3e255ffbfda88cfc284f3b 100644
--- a/ui/file_manager/gallery/js/gallery.js
+++ b/ui/file_manager/gallery/js/gallery.js
@@ -96,8 +96,7 @@
   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(); };
 
@@ -122,7 +121,7 @@
   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');
@@ -137,15 +136,14 @@
   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));
 
@@ -158,8 +156,7 @@
 
   this.slideMode_ = new SlideMode(this.container_,
                                   content,
-                                  this.topToolbar_,
-                                  this.bottomToolbar_,
+                                  this.toolbar_,
                                   this.prompt_,
                                   this.errorBanner_,
                                   this.dataModel_,
@@ -275,7 +272,7 @@
  * @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;
 };
@@ -532,7 +529,6 @@
           mosaic.show();
           onModeChanged();
         }.bind(this));
-    this.bottomToolbar_.hidden = true;
   } else {
     this.setCurrentMode_(this.slideMode_);
     this.slideMode_.enter(
@@ -543,7 +539,6 @@
           mosaic.hide();
         }.bind(this),
         onModeChanged);
-    this.bottomToolbar_.hidden = false;
   }
 };