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

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

Index: chrome/browser/resources/file_manager/js/file_manager.js
diff --git a/chrome/browser/resources/file_manager/js/file_manager.js b/chrome/browser/resources/file_manager/js/file_manager.js
index 1043e23cafe49b95e2b9f27412c1f927978e2ffc..1bf9650925a81ebdc6c4d530760a5df849c8d1db 100644
--- a/chrome/browser/resources/file_manager/js/file_manager.js
+++ b/chrome/browser/resources/file_manager/js/file_manager.js
@@ -621,6 +621,10 @@ DialogType.isModal = function(type) {
   };
 
   FileManager.prototype.onMaximize = function() {
+    // Do not maximize when running via chrome://files in a browser.
+    if (!chrome.app.window.contentWindow)
+      return;
+
     var appWindow = chrome.app.window.current();
     if (appWindow.isMaximized())
       appWindow.restore();
@@ -629,6 +633,10 @@ DialogType.isModal = function(type) {
   };
 
   FileManager.prototype.onClose = function() {
+    // Do not close when running via chrome://files in a browser.
+    if (!chrome.app.window.contentWindow)
+      return;
+
     window.close();
   };
 
@@ -878,10 +886,16 @@ DialogType.isModal = function(type) {
     this.initDialogType_();
 
     // Show the window as soon as the UI pre-initialization is done.
-    // Do not call show() when running via chrome://files in a browser.
     if (this.dialogType == DialogType.FULL_PAGE && util.platform.v2()) {
-      chrome.app.window.current().show();
-      setTimeout(callback, 100);  // Wait until the animation is finished.
+      // 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();
+      }
     } else {
       callback();
     }