diff options
Diffstat (limited to 'chrome/browser')
5 files changed, 2 insertions, 23 deletions
diff --git a/chrome/browser/chromeos/file_manager/url_util.cc b/chrome/browser/chromeos/file_manager/url_util.cc index fecf759..ff703e8 100644 --- a/chrome/browser/chromeos/file_manager/url_util.cc +++ b/chrome/browser/chromeos/file_manager/url_util.cc @@ -113,8 +113,6 @@ GURL GetFileManagerMainPageUrlWithParams( std::string json_args; base::JSONWriter::Write(&arg_value, &json_args); - // kChromeUIFileManagerURL could not be used since query parameters are not - // supported for it. std::string url = GetFileManagerMainPageUrl().spec() + '?' + net::EscapeUrlEncodedData(json_args, false); // Space to %20 instead of +. diff --git a/chrome/browser/extensions/extension_url_rewrite_browsertest.cc b/chrome/browser/extensions/extension_url_rewrite_browsertest.cc index 0db2dcb..6dc93f0 100644 --- a/chrome/browser/extensions/extension_url_rewrite_browsertest.cc +++ b/chrome/browser/extensions/extension_url_rewrite_browsertest.cc @@ -111,14 +111,6 @@ IN_PROC_BROWSER_TEST_F(ExtensionURLRewriteBrowserTest, MAYBE_BookmarksURL) { EXPECT_TRUE(navigation->GetURL().SchemeIs(extensions::kExtensionScheme)); } -#if defined(FILE_MANAGER_EXTENSION) -IN_PROC_BROWSER_TEST_F(ExtensionURLRewriteBrowserTest, FileManagerURL) { - // Navigate to chrome://files and check that the location bar URL is - // what was entered and the internal URL uses the chrome-extension:// scheme. - TestExtensionURLOverride(GURL(chrome::kChromeUIFileManagerURL)); -} -#endif - IN_PROC_BROWSER_TEST_F(ExtensionURLRewriteBrowserTest, BookmarksURLWithRef) { // Navigate to chrome://bookmarks/#1 and check that the location bar URL is // what was entered and the internal URL uses the chrome-extension:// scheme. diff --git a/chrome/browser/resources/file_manager/js/file_manager.js b/chrome/browser/resources/file_manager/js/file_manager.js index 25008e9..d888cd3 100644 --- a/chrome/browser/resources/file_manager/js/file_manager.js +++ b/chrome/browser/resources/file_manager/js/file_manager.js @@ -481,10 +481,6 @@ var BOTTOM_MARGIN_FOR_PREVIEW_PANEL_PX = 52; }; FileManager.prototype.onMaximize = function() { - // Do not maximize when running via chrome://files in a browser. - if (util.platform.runningInBrowser()) - return; - var appWindow = chrome.app.window.current(); if (appWindow.isMaximized()) appWindow.restore(); @@ -493,10 +489,6 @@ var BOTTOM_MARGIN_FOR_PREVIEW_PANEL_PX = 52; }; FileManager.prototype.onClose = function() { - // Do not close when running via chrome://files in a browser. - if (util.platform.runningInBrowser()) - return; - window.close(); }; diff --git a/chrome/browser/resources/file_manager/js/util.js b/chrome/browser/resources/file_manager/js/util.js index 5e1c449..9f6e88f 100644 --- a/chrome/browser/resources/file_manager/js/util.js +++ b/chrome/browser/resources/file_manager/js/util.js @@ -725,8 +725,8 @@ function strf(id, var_args) { */ util.platform = { /** - * @return {boolean} True if Files.app is running via "chrome://files", open - * files or select folder dialog. False otherwise. + * @return {boolean} True if Files.app is running as an open files or a select + * folder dialog. False otherwise. */ runningInBrowser: function() { return !window.appID; diff --git a/chrome/browser/resources/file_manager/manifest.json b/chrome/browser/resources/file_manager/manifest.json index 9c52de7..5222c4e 100644 --- a/chrome/browser/resources/file_manager/manifest.json +++ b/chrome/browser/resources/file_manager/manifest.json @@ -213,9 +213,6 @@ "file_filters": [] } ], - "chrome_url_overrides": { - "files": "main.html" - }, // Required to import scripts in a web worker. Note, that in Apps v2, it is // enough that anything is passed to web_accessible_resources. If there is // at least any file, then all files are allowed. http://crbug.com/179127. |