File SWA: Renames grit resources

In order to avoid conflic with resource names used by Files App, we
append _SWA suffix to IDR_FILE_MANAGER_. Both Files App and File SWA
use IDR_FILE_MANAGER_ prefix, as they both reside in file_manager
directories.

Bug: 1113981
Change-Id: I903f9e7eaf2587b13a362b96aa2f75fcecce4439
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2503992
Commit-Queue: Bo Majewski <majewski@chromium.org>
Reviewed-by: Alex Danilo <adanilo@chromium.org>
Reviewed-by: Giovanni Ortuño Urquidi <ortuno@chromium.org>
Cr-Commit-Position: refs/heads/master@{#823443}

chrome/browser/chromeos/web_applications/file_manager_web_app_info.cc

@@ -20,7 +20,7 @@ std::unique_ptr<WebApplicationInfo> CreateWebAppInfoForFileManager() {
   // TODO(majewski): Fetch from a resource.
   info->title = base::UTF8ToUTF16("File Manager");
   web_app::CreateIconInfoForSystemWebApp(
-      info->start_url, {{"icon192.png", 192, IDR_FILE_MANAGER_ICON_192}},
+      info->start_url, {{"icon192.png", 192, IDR_FILE_MANAGER_SWA_ICON_192}},
       *info);
   info->theme_color = 0xFF4285F4;
   info->background_color = 0xFFFFFFFF;

chromeos/components/file_manager/file_manager_ui.cc

@@ -22,22 +22,22 @@ FileManagerUI::FileManagerUI(content::WebUI* web_ui,
       chromeos::file_manager::kChromeUIFileManagerHost));
   source->AddLocalizedStrings(*this->delegate()->GetFileManagerAppStrings());
   // The HTML content loaded on chrome://file-manager.
-  source->AddResourcePath("", IDR_FILE_MANAGER_MAIN_HTML);
+  source->AddResourcePath("", IDR_FILE_MANAGER_SWA_MAIN_HTML);
 
   // The resources requested by chrome://file-manager HTML.
-  source->AddResourcePath("main.css", IDR_FILE_MANAGER_MAIN_CSS);
-  source->AddResourcePath("main.js", IDR_FILE_MANAGER_MAIN_JS);
+  source->AddResourcePath("main.css", IDR_FILE_MANAGER_SWA_MAIN_CSS);
+  source->AddResourcePath("main.js", IDR_FILE_MANAGER_SWA_MAIN_JS);
   source->AddResourcePath("file_manager.mojom-lite.js",
-                          IDR_FILE_MANAGER_MOJO_LITE_JS);
+                          IDR_FILE_MANAGER_SWA_MOJO_LITE_JS);
   source->AddResourcePath("browser_proxy.js",
-                          IDR_FILE_MANAGER_BROWSER_PROXY_JS);
+                          IDR_FILE_MANAGER_SWA_BROWSER_PROXY_JS);
 
 #if !DCHECK_IS_ON()
   // If a user goes to an invalid url and non-DCHECK mode (DHECK = debug mode)
   // 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
   // developer and be able to identify an error occurred.
-  source->SetDefaultResource(IDR_FILE_MANAGER_MAIN_HTML);
+  source->SetDefaultResource(IDR_FILE_MANAGER_SWA_MAIN_HTML);
 #endif  // !DCHECK_IS_ON()
 
   auto* browser_context = web_ui->GetWebContents()->GetBrowserContext();

chromeos/components/file_manager/resources/file_manager_resources.grd

@@ -14,14 +14,14 @@
     <includes>
       <if expr="is_official_build == false">
         <!-- Privileged app host contents. -->
-        <include name="IDR_FILE_MANAGER_BROWSER_PROXY_JS" file="browser_proxy.js" type="BINDATA" />
-        <include name="IDR_FILE_MANAGER_MAIN_HTML" file="main.html" type="BINDATA" />
-        <include name="IDR_FILE_MANAGER_MAIN_CSS" file="main.css" type="BINDATA" />
-        <include name="IDR_FILE_MANAGER_MAIN_JS" file="main.js" type="BINDATA" />
-        <include name="IDR_FILE_MANAGER_ICON_192" file="images/icon192.png" type="BINDATA" />
+        <include name="IDR_FILE_MANAGER_SWA_BROWSER_PROXY_JS" file="browser_proxy.js" type="BINDATA" />
+        <include name="IDR_FILE_MANAGER_SWA_MAIN_HTML" file="main.html" type="BINDATA" />
+        <include name="IDR_FILE_MANAGER_SWA_MAIN_CSS" file="main.css" type="BINDATA" />
+        <include name="IDR_FILE_MANAGER_SWA_MAIN_JS" file="main.js" type="BINDATA" />
+        <include name="IDR_FILE_MANAGER_SWA_ICON_192" file="images/icon192.png" type="BINDATA" />
 
         <!-- Mojo resources -->
-        <include name="IDR_FILE_MANAGER_MOJO_LITE_JS"
+        <include name="IDR_FILE_MANAGER_SWA_MOJO_LITE_JS"
           file="$root_gen_dir\chromeos\components\file_manager\mojom\file_manager.mojom-lite.js"
           use_base_dir="false"
           type="BINDATA" />