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

Unified Diff: ui/file_manager/file_manager/foreground/js/file_manager.js

Issue 291893006: Gallery.app: Remove old Gallery files. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 7 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
Index: ui/file_manager/file_manager/foreground/js/file_manager.js
diff --git a/ui/file_manager/file_manager/foreground/js/file_manager.js b/ui/file_manager/file_manager/foreground/js/file_manager.js
index 8ded73bf89206f26aed4b1d81feee99aef33e18e..f916129070ac8f271a4778bd2267bd3c775cbb1a 100644
--- a/ui/file_manager/file_manager/foreground/js/file_manager.js
+++ b/ui/file_manager/file_manager/foreground/js/file_manager.js
@@ -1590,29 +1590,9 @@ var BOTTOM_MARGIN_FOR_PREVIEW_PANEL_PX = 52;
return;
var task = null;
- // Handle restoring after crash, or the gallery action.
- // TODO(mtomasz): Use the gallery action instead of just the gallery
- // field.
- if (this.params_.gallery ||
- this.params_.action === 'gallery' ||
- this.params_.action === 'gallery-video') {
- if (!opt_selectionEntry) {
- // Non-existent file or a directory.
- // Reloading while the Gallery is open with empty or multiple
- // selection. Open the Gallery when the directory is scanned.
- task = function() {
- new FileTasks(this, this.params_).openGallery([]);
- }.bind(this);
- } else {
- // The file or the directory exists.
- task = function() {
- new FileTasks(this, this.params_).openGallery([opt_selectionEntry]);
- }.bind(this);
- }
- } else {
- // TODO(mtomasz): Implement remounting archives after crash.
- // See: crbug.com/333139
- }
+
+ // TODO(mtomasz): Implement remounting archives after crash.
+ // See: crbug.com/333139
// If there is a task to be run, run it after the scan is completed.
if (task) {
@@ -1889,64 +1869,6 @@ var BOTTOM_MARGIN_FOR_PREVIEW_PANEL_PX = 52;
};
/**
- * Shows a modal-like file viewer/editor on top of the File Manager UI.
- *
- * @param {HTMLElement} popup Popup element.
- * @param {function()} closeCallback Function to call after the popup is
- * closed.
- */
- FileManager.prototype.openFilePopup = function(popup, closeCallback) {
- this.closeFilePopup();
- this.filePopup_ = popup;
- this.filePopupCloseCallback_ = closeCallback;
- this.dialogDom_.insertBefore(
- this.filePopup_, this.dialogDom_.querySelector('#iframe-drag-area'));
- this.filePopup_.focus();
- this.document_.body.setAttribute('overlay-visible', '');
- this.document_.querySelector('#iframe-drag-area').hidden = false;
- };
-
- /**
- * Closes the modal-like file viewer/editor popup.
- */
- FileManager.prototype.closeFilePopup = function() {
- if (this.filePopup_) {
- this.document_.body.removeAttribute('overlay-visible');
- this.document_.querySelector('#iframe-drag-area').hidden = true;
- // The window resize would not be processed properly while the relevant
- // divs had 'display:none', force resize after the layout fired.
- setTimeout(this.onResize_.bind(this), 0);
- if (this.filePopup_.contentWindow &&
- this.filePopup_.contentWindow.unload) {
- this.filePopup_.contentWindow.unload();
- }
-
- if (this.filePopupCloseCallback_) {
- this.filePopupCloseCallback_();
- this.filePopupCloseCallback_ = null;
- }
-
- // These operations have to be in the end, otherwise v8 crashes on an
- // assert. See: crbug.com/224174.
- this.dialogDom_.removeChild(this.filePopup_);
- this.filePopup_ = null;
- }
- };
-
- /**
- * Updates visibility of the draggable app region in the modal-like file
- * viewer/editor.
- *
- * @param {boolean} visible True for visible, false otherwise.
- */
- FileManager.prototype.onFilePopupAppRegionChanged = function(visible) {
- if (!this.filePopup_)
- return;
-
- this.document_.querySelector('#iframe-drag-area').hidden = !visible;
- };
-
- /**
* @return {Array.<Entry>} List of all entries in the current directory.
*/
FileManager.prototype.getAllEntriesInCurrentDirectory = function() {

Powered by Google App Engine
This is Rietveld 408576698