Merge 234982 "[Files.app] Make the file-type dropbox at the bott..."

chrome/browser/resources/file_manager/foreground/js/file_manager.js

 // Copyright (c) 2012 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.
 
 'use strict';
 
 /**
  * FileManager constructor.
  *
  * FileManager objects encapsulate the functionality of the file selector
@@ skipping 1300 matching lines @@
 
        option.value = i + 1;
 
        if (fileType.selected)
          option.selected = true;
 
        this.fileTypeSelector_.appendChild(option);
     }
 
     var options = this.fileTypeSelector_.querySelectorAll('option');
-    if (options.length < 2) {
-      // There is in fact no choice, hide the selector.
-      this.fileTypeSelector_.hidden = true;
-      return;
+    if (options.length >= 2) {
+      // There is in fact no choice, show the selector.
+      this.fileTypeSelector_.hidden = false;
+
+      this.fileTypeSelector_.addEventListener('change',
+          this.updateFileTypeFilter_.bind(this));
     }
-
-    this.fileTypeSelector_.addEventListener('change',
-        this.updateFileTypeFilter_.bind(this));
   };
 
   /**
    * Filters file according to the selected file type.
    * @private
    */
   FileManager.prototype.updateFileTypeFilter_ = function() {
     this.fileFilter_.removeFilter('fileType');
     var selectedIndex = this.getSelectedFilterIndex_();
     if (selectedIndex > 0) { // Specific filter selected.
@@ skipping 2288 matching lines @@
       callback(this.preferences_);
       return;
     }
 
     chrome.fileBrowserPrivate.getPreferences(function(prefs) {
       this.preferences_ = prefs;
       callback(prefs);
     }.bind(this));
   };
 })();