Merge 198700 "Changed the item click behavior of auto complete l..."

chrome/browser/resources/file_manager/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';
 
 /**
  * This variable is checked in SelectFileDialogExtensionBrowserTest.
  * @type {number}
  */
@@ skipping 3438 matching lines @@
     }
 
     var urls = [entry.toURL()];
     var self = this;
 
     // To open a file, first get the mime type.
     this.metadataCache_.get(urls, 'drive', function(props) {
       var mimeType = props[0].contentMimeType || '';
       var mimeTypes = [mimeType];
       var openIt = function() {
-        var tasks = new FileTasks(self);
-        tasks.init(urls, mimeTypes);
-        tasks.executeDefault();
-      }
+        if (self.dialogType == DialogType.FULL_PAGE) {
+          var tasks = new FileTasks(self);
+          tasks.init(urls, mimeTypes);
+          tasks.executeDefault();
+        } else {
+          self.onOk_();
+        }
+      };
 
       // Change the current directory to the directory that contains the
       // selected file. Note that this is necessary for an image or a video,
       // which should be opened in the gallery mode, as the gallery mode
       // requires the entry to be in the current directory model. For
       // consistency, the current directory is always changed regardless of
       // the file type.
       entry.getParent(function(parent) {
         var onDirectoryChanged = function(event) {
           self.directoryModel_.removeEventListener('scan-completed',
@@ skipping 182 matching lines @@
    * Set the flag expressing whether the ctrl key is pressed or not.
    * @param {boolean} flag New value of the flag
    * @private
    */
   FileManager.prototype.setCtrlKeyPressed_ = function(flag) {
     this.ctrlKeyPressed_ = flag;
     this.document_.querySelector('#drive-clear-local-cache').canExecuteChange();
     this.document_.querySelector('#drive-reload').canExecuteChange();
   };
 })();