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

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 1bf9650925a81ebdc6c4d530760a5df849c8d1db..1f949c2eb9f6bf98524085c99a6e6485e567ae30 100644
--- a/chrome/browser/resources/file_manager/js/file_manager.js
+++ b/chrome/browser/resources/file_manager/js/file_manager.js
@@ -622,7 +622,7 @@ DialogType.isModal = function(type) {
 
   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();
@@ -634,7 +634,7 @@ DialogType.isModal = function(type) {
 
   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();
@@ -886,16 +886,11 @@ DialogType.isModal = function(type) {
     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();
     }