Skip to content

Commit

Permalink
Remove unnecessary handling for fake entry on setting up initial dire…
Browse files Browse the repository at this point in the history
…ctory.

BUG=none
TEST=run browser_tests gtest_filter=*FileManager*

Review URL: https://codereview.chromium.org/724693002

Cr-Commit-Position: refs/heads/master@{#304182}
  • Loading branch information
fukino authored and Commit bot committed Nov 14, 2014
1 parent 2ae60f1 commit 637fe98
Showing 1 changed file with 5 additions and 9 deletions.
14 changes: 5 additions & 9 deletions ui/file_manager/file_manager/foreground/js/file_manager.js
Original file line number Diff line number Diff line change
Expand Up @@ -1349,7 +1349,7 @@ var BOTTOM_MARGIN_FOR_PREVIEW_PANEL_PX = 52;
callback();
}.bind(this), callback);
// TODO(mtomasz): Implement reopening on special search, when fake
// entries are converted to directory providers.
// entries are converted to directory providers. crbug.com/433161.
}.bind(this));

// If the directory to be changed to is not available, then first fallback
Expand Down Expand Up @@ -1476,14 +1476,10 @@ var BOTTOM_MARGIN_FOR_PREVIEW_PANEL_PX = 52;
FileManager.prototype.finishSetupCurrentDirectory_ = function(
directoryEntry, opt_selectionEntry, opt_suggestedName) {
// Open the directory, and select the selection (if passed).
if (util.isFakeEntry(directoryEntry)) {
this.directoryModel_.specialSearch(directoryEntry, '');
} else {
this.directoryModel_.changeDirectoryEntry(directoryEntry, function() {
if (opt_selectionEntry)
this.directoryModel_.selectEntry(opt_selectionEntry);
}.bind(this));
}
this.directoryModel_.changeDirectoryEntry(directoryEntry, function() {
if (opt_selectionEntry)
this.directoryModel_.selectEntry(opt_selectionEntry);
}.bind(this));

if (this.dialogType === DialogType.FULL_PAGE) {
// In the FULL_PAGE mode if the restored URL points to a file we might
Expand Down

0 comments on commit 637fe98

Please sign in to comment.