Files.app: Fix errors when launching Files.app via "chrome://files" (2)

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 604 matching lines @@
     this.syncButton.checkable = true;
     this.hostedButton.checkable = true;
     if (util.platform.newUI()) {
       this.detailViewButton_.checkable = true;
       this.thumbnailViewButton_.checkable = true;
     }
   };
 
   FileManager.prototype.onMaximize = function() {
     // Do not maximize when running via chrome://files in a browser.
-    if (!chrome.app.window.contentWindow)
+    if (util.platform.runningInBrowser())
       return;
 
     var appWindow = chrome.app.window.current();
     if (appWindow.isMaximized())
       appWindow.restore();
     else
       appWindow.maximize();
   };
 
   FileManager.prototype.onClose = function() {
     // Do not close when running via chrome://files in a browser.
-    if (!chrome.app.window.contentWindow)
+    if (util.platform.runningInBrowser())
       return;
 
     window.close();
   };
 
   /**
    * One-time initialization of commands.
    * @private
    */
   FileManager.prototype.initCommands_ = function() {
@@ skipping 231 matching lines @@
 
     // Initialize the new header.
     if (util.platform.newUI()) {
       this.dialogDom_.querySelector('#app-name').innerText =
           chrome.runtime.getManifest().name;
     }
 
     this.initDialogType_();
 
     // Show the window as soon as the UI pre-initialization is done.
-    if (this.dialogType == DialogType.FULL_PAGE && util.platform.v2()) {
-      // Do not call show() when running via chrome://files in a browser.
-      if (chrome.app.window.contentWindow) {
-        chrome.app.window.current().show();
-        setTimeout(callback, 100);  // Wait until the animation is finished.
-      } else {
-        console.info('Files.app window is not created yet. Maybe launched ' +
-                     'via chrome://files in a browser?');
-        callback();
-      }
+    if (this.dialogType == DialogType.FULL_PAGE &&
+        util.platform.v2() &&
+        !util.platform.runningInBrowser()) {
+      chrome.app.window.current().show();
+      setTimeout(callback, 100);  // Wait until the animation is finished.
     } else {
       callback();
     }
   };
 
   /**
    * One-time initialization of dialogs.
    * @private
    */
   FileManager.prototype.initDialogs_ = function() {
@@ skipping 3001 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();
   };
 })();