Commit 590f451b authored by Bo Majewski's avatar Bo Majewski Committed by Commit Bot

Files SWA: Add more structure to the code

Moves all main files to main.*
Creates a separate directory for images and moves the icon there
Renames resources ID to match file names.

Bug: 1111229
Change-Id: Idbf49a3fb273bf7a4a64cb1431087db1199a9ed3
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2409657
Commit-Queue: Bo Majewski <majewski@chromium.org>
Reviewed-by: default avatarAlex Danilo <adanilo@chromium.org>
Cr-Commit-Position: refs/heads/master@{#809630}
parent 5cbbfd1d
...@@ -20,12 +20,11 @@ FileManagerUI::FileManagerUI(content::WebUI* web_ui) ...@@ -20,12 +20,11 @@ FileManagerUI::FileManagerUI(content::WebUI* web_ui)
auto source = base::WrapUnique(content::WebUIDataSource::Create( auto source = base::WrapUnique(content::WebUIDataSource::Create(
chromeos::file_manager::kChromeUIFileManagerHost)); chromeos::file_manager::kChromeUIFileManagerHost));
// The HTML content loaded on chrome://file-manager. // The HTML content loaded on chrome://file-manager.
source->AddResourcePath("", IDR_FILE_MANAGER_FILE_MANAGER_HTML); source->AddResourcePath("", IDR_FILE_MANAGER_MAIN_HTML);
// The resources requested by chrome://file-manager HTML. // The resources requested by chrome://file-manager HTML.
source->AddResourcePath("file_manager.css", source->AddResourcePath("main.css", IDR_FILE_MANAGER_MAIN_CSS);
IDR_FILE_MANAGER_FILE_MANAGER_CSS); source->AddResourcePath("main.js", IDR_FILE_MANAGER_MAIN_JS);
source->AddResourcePath("file_manager.js", IDR_FILE_MANAGER_FILE_MANAGER_JS);
source->AddResourcePath("file_manager.mojom-lite.js", source->AddResourcePath("file_manager.mojom-lite.js",
IDR_FILE_MANAGER_MOJO_LITE_JS); IDR_FILE_MANAGER_MOJO_LITE_JS);
source->AddResourcePath("browser_proxy.js", source->AddResourcePath("browser_proxy.js",
...@@ -36,7 +35,7 @@ FileManagerUI::FileManagerUI(content::WebUI* web_ui) ...@@ -36,7 +35,7 @@ FileManagerUI::FileManagerUI(content::WebUI* web_ui)
// is set, serve a default page so the user sees your default page instead // is set, serve a default page so the user sees your default page instead
// of an unexpected error. But if DCHECK is set, the user will be a // of an unexpected error. But if DCHECK is set, the user will be a
// developer and be able to identify an error occurred. // developer and be able to identify an error occurred.
source->SetDefaultResource(IDR_FILE_MANAGER_FILE_MANAGER_HTML); source->SetDefaultResource(IDR_FILE_MANAGER_MAIN_HTML);
#endif // !DCHECK_IS_ON() #endif // !DCHECK_IS_ON()
auto* browser_context = web_ui->GetWebContents()->GetBrowserContext(); auto* browser_context = web_ui->GetWebContents()->GetBrowserContext();
......
...@@ -4,14 +4,14 @@ ...@@ -4,14 +4,14 @@
import("//third_party/closure_compiler/compile_js.gni") import("//third_party/closure_compiler/compile_js.gni")
js_library("file_manager_js") { js_library("main_js") {
sources = [ sources = [
"browser_proxy.js", "browser_proxy.js",
"file_manager.js", "main.js",
] ]
deps = [ "//chromeos/components/file_manager:file_manager_mojom_js_library_for_compile" ] deps = [ "//chromeos/components/file_manager:file_manager_mojom_js_library_for_compile" ]
} }
js_type_check("closure_compile") { js_type_check("closure_compile") {
deps = [ ":file_manager_js" ] deps = [ ":main_js" ]
} }
...@@ -15,10 +15,10 @@ ...@@ -15,10 +15,10 @@
<if expr="is_official_build == false"> <if expr="is_official_build == false">
<!-- Privileged app host contents. --> <!-- Privileged app host contents. -->
<include name="IDR_FILE_MANAGER_BROWSER_PROXY_JS" file="browser_proxy.js" type="BINDATA" /> <include name="IDR_FILE_MANAGER_BROWSER_PROXY_JS" file="browser_proxy.js" type="BINDATA" />
<include name="IDR_FILE_MANAGER_FILE_MANAGER_HTML" file="file_manager.html" type="BINDATA" /> <include name="IDR_FILE_MANAGER_MAIN_HTML" file="main.html" type="BINDATA" />
<include name="IDR_FILE_MANAGER_FILE_MANAGER_CSS" file="file_manager.css" type="BINDATA" /> <include name="IDR_FILE_MANAGER_MAIN_CSS" file="main.css" type="BINDATA" />
<include name="IDR_FILE_MANAGER_FILE_MANAGER_JS" file="file_manager.js" type="BINDATA" /> <include name="IDR_FILE_MANAGER_MAIN_JS" file="main.js" type="BINDATA" />
<include name="IDR_FILE_MANAGER_ICON_192" file="icon192.png" type="BINDATA" /> <include name="IDR_FILE_MANAGER_ICON_192" file="images/icon192.png" type="BINDATA" />
<!-- Mojo resources --> <!-- Mojo resources -->
<include name="IDR_FILE_MANAGER_MOJO_LITE_JS" <include name="IDR_FILE_MANAGER_MOJO_LITE_JS"
......
...@@ -8,13 +8,13 @@ ...@@ -8,13 +8,13 @@
<title>File Manager WebUI Demo</title> <title>File Manager WebUI Demo</title>
<meta charset="utf-8"> <meta charset="utf-8">
<link rel="stylesheet" href="chrome://resources/css/text_defaults.css"> <link rel="stylesheet" href="chrome://resources/css/text_defaults.css">
<link rel="stylesheet" href="file_manager.css"> <link rel="stylesheet" href="main.css">
<script src="chrome://resources/js/util.js"></script> <script src="chrome://resources/js/util.js"></script>
<script src="chrome://resources/mojo/mojo/public/js/mojo_bindings_lite.js"> <script src="chrome://resources/mojo/mojo/public/js/mojo_bindings_lite.js">
</script> </script>
<script src="chrome://file-manager/file_manager.mojom-lite.js"></script> <script src="chrome://file-manager/file_manager.mojom-lite.js"></script>
<script src="chrome://file-manager/browser_proxy.js"></script> <script src="chrome://file-manager/browser_proxy.js"></script>
<script src="chrome://file-manager/file_manager.js"></script> <script src="chrome://file-manager/main.js"></script>
</head> </head>
<body> <body>
<h1>File Manager WebUI Demo</h1> <h1>File Manager WebUI Demo</h1>
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment