Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(306)

Unified Diff: ui/file_manager/gallery/js/slide_mode.js

Issue 1170403005: Revert of Gallery: Add toolbar at the top of window. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/file_manager/gallery/js/gallery.js ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/file_manager/gallery/js/slide_mode.js
diff --git a/ui/file_manager/gallery/js/slide_mode.js b/ui/file_manager/gallery/js/slide_mode.js
index 21d986caae3d10953ad0ab6b0ba15042b9cb7d07..2476ba277536c68e63c035b0c697f00cb31a939c 100644
--- a/ui/file_manager/gallery/js/slide_mode.js
+++ b/ui/file_manager/gallery/js/slide_mode.js
@@ -8,8 +8,7 @@
*
* @param {!HTMLElement} container Main container element.
* @param {!HTMLElement} content Content container element.
- * @param {!HTMLElement} topToolbar Top toolbar element.
- * @param {!HTMLElement} bottomToolbar Toolbar element.
+ * @param {!HTMLElement} toolbar Toolbar element.
* @param {!ImageEditor.Prompt} prompt Prompt.
* @param {!ErrorBanner} errorBanner Error banner.
* @param {!cr.ui.ArrayDataModel} dataModel Data model.
@@ -26,9 +25,9 @@
* @suppress {checkStructDictInheritance}
* @extends {cr.EventTarget}
*/
-function SlideMode(container, content, topToolbar, bottomToolbar, prompt,
- errorBanner, dataModel, selectionModel, metadataModel, thumbnailModel,
- context, volumeManager, toggleMode, displayStringFunction) {
+function SlideMode(container, content, toolbar, prompt, errorBanner, dataModel,
+ selectionModel, metadataModel, thumbnailModel, context, volumeManager,
+ toggleMode, displayStringFunction) {
/**
* @type {!HTMLElement}
* @private
@@ -54,14 +53,7 @@
* @private
* @const
*/
- this.topToolbar_ = topToolbar;
-
- /**
- * @type {!HTMLElement}
- * @private
- * @const
- */
- this.bottomToolbar_ = bottomToolbar;
+ this.toolbar_ = toolbar;
/**
* @type {!ImageEditor.Prompt}
@@ -227,7 +219,7 @@
* @const
*/
this.options_ = util.createChild(queryRequiredElement(
- this.topToolbar_, '.filename-spacer'), 'options');
+ this.toolbar_, '.filename-spacer'), 'options');
/**
* @type {!HTMLElement}
@@ -278,7 +270,7 @@
* @private
* @const
*/
- this.bubble_ = util.createChild(this.bottomToolbar_, 'bubble');
+ this.bubble_ = util.createChild(this.toolbar_, 'bubble');
this.bubble_.hidden = true;
/**
@@ -335,8 +327,7 @@
* @private
* @const
*/
- this.ribbonSpacer_ = queryRequiredElement(this.bottomToolbar_,
- '.ribbon-spacer');
+ this.ribbonSpacer_ = queryRequiredElement(this.toolbar_, '.ribbon-spacer');
/**
* @type {!Ribbon}
@@ -353,8 +344,7 @@
* @type {!HTMLElement}
* @const
*/
- var slideShowButton = queryRequiredElement(this.topToolbar_,
- 'button.slideshow');
+ var slideShowButton = queryRequiredElement(this.toolbar_, 'button.slideshow');
slideShowButton.title = this.displayStringFunction_('GALLERY_SLIDESHOW');
slideShowButton.addEventListener('click',
this.startSlideshow.bind(this, SlideMode.SLIDESHOW_INTERVAL_FIRST));
@@ -376,7 +366,7 @@
* @private
* @const
*/
- this.editButton_ = queryRequiredElement(this.topToolbar_, 'button.edit');
+ this.editButton_ = queryRequiredElement(this.toolbar_, 'button.edit');
this.editButton_.title = this.displayStringFunction_('GALLERY_EDIT');
this.editButton_.disabled = true; // Disabled by default.
this.editButton_.addEventListener('click', this.toggleEditor.bind(this));
@@ -386,7 +376,7 @@
* @private
* @const
*/
- this.printButton_ = queryRequiredElement(this.topToolbar_, 'button.print');
+ this.printButton_ = queryRequiredElement(this.toolbar_, 'button.print');
this.printButton_.title = this.displayStringFunction_('GALLERY_PRINT');
this.printButton_.disabled = true; // Disabled by default.
this.printButton_.addEventListener('click', this.print_.bind(this));
@@ -396,8 +386,7 @@
* @private
* @const
*/
- this.editBarSpacer_ = queryRequiredElement(this.bottomToolbar_,
- '.edit-bar-spacer');
+ this.editBarSpacer_ = queryRequiredElement(this.toolbar_, '.edit-bar-spacer');
/**
* @type {!HTMLElement}
« no previous file with comments | « ui/file_manager/gallery/js/gallery.js ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698