[Commands]: Don't violate deps in brave/components/resources (#28875)

browser/resources/settings/BUILD.gn

@@ -63,6 +63,11 @@ generate_grd("build_grd") {
   input_files_base_dir = rebase_path(".", "//")
 
   deps = [ ":preprocess" ]
+
+  if (!is_android) {
+    grdp_files = [ "$root_gen_dir/brave/web-ui-commands/commands.grdp" ]
+    deps += [ "shortcuts_page:commands_ui" ]
+  }
 }
 
 # Move brave files to the place where chromium settings page is compiled from.

browser/resources/settings/shortcuts_page/BUILD.gn

@@ -6,6 +6,8 @@
 import("//brave/components/common/typescript.gni")
 
 transpile_web_ui("commands_ui") {
+  generate_grdp = true
+
   entry_points = [ [
         "commands",
         rebase_path("commands.tsx"),
@@ -18,9 +20,3 @@ transpile_web_ui("commands_ui") {
 
   resource_name = "commands"
 }
-
-pack_web_resources("generated_resources") {
-  resource_name = "commands"
-  output_dir = "$root_gen_dir/brave/browser/resources/settings/shortcuts_page"
-  deps = [ ":commands_ui" ]
-}

browser/ui/BUILD.gn

@@ -1307,7 +1307,6 @@ source_set("ui") {
     ]
     deps += [
       "//brave/browser/brave_wallet:tab_helper",
-      "//brave/browser/resources/settings/shortcuts_page:generated_resources",
       "//brave/browser/ui/brave_wallet",
       "//brave/browser/ui/webui/brave_wallet/common_handler",
       "//brave/components/brave_wallet/browser:permission_utils",

browser/ui/webui/brave_settings_ui.cc

@@ -16,7 +16,6 @@
 #include "brave/browser/ntp_background/view_counter_service_factory.h"
 #include "brave/browser/resources/settings/grit/brave_settings_resources.h"
 #include "brave/browser/resources/settings/grit/brave_settings_resources_map.h"
-#include "brave/browser/resources/settings/shortcuts_page/grit/commands_generated_map.h"
 #include "brave/browser/shell_integrations/buildflags/buildflags.h"
 #include "brave/browser/ui/commands/accelerator_service_factory.h"
 #include "brave/browser/ui/tabs/features.h"
@@ -124,15 +123,6 @@ void BraveSettingsUI::AddResources(content::WebUIDataSource* html_source,
                                    Profile* profile) {
   html_source->AddResourcePaths(kBraveSettingsResources);
 
-  // These resource files are generated from the files in
-  // brave/browser/resources/settings/shortcuts_page
-  // They are generated separately so they can use React and our Leo
-  // components, and the React DOM is mounted inside a Web Component, so it
-  // doesn't interfere with the Polymer tree/styles.
-  if (base::FeatureList::IsEnabled(commands::features::kBraveCommands)) {
-    html_source->AddResourcePaths(kCommandsGenerated);
-  }
-
   html_source->AddBoolean("isSyncDisabled", !syncer::IsSyncAllowedByFlag());
   html_source->AddString(
       "braveProductVersion",

components/resources/BUILD.gn

@@ -149,13 +149,6 @@ repack("resources") {
     sources += [ "$root_gen_dir/brave/components/playlist/browser/resources/playlist_generated.pak" ]
   }
 
-  if (!is_android && !is_ios) {
-    deps += [
-      "//brave/browser/resources/settings/shortcuts_page:generated_resources",
-    ]
-    sources += [ "$root_gen_dir/brave/browser/resources/settings/shortcuts_page/commands_generated.pak" ]
-  }
-
   output = "$root_gen_dir/components/brave_components_resources.pak"
 }
 

resources/resource_ids.spec

@@ -173,10 +173,6 @@
     "META": {"sizes": {"includes": [10]}},
     "includes": [34140],
   },
-  "<(SHARED_INTERMEDIATE_DIR)/brave/web-ui-commands/commands.grd": {
-    "META": {"sizes": {"includes": [10]}},
-    "includes": [34150],
-  },
   "<(SHARED_INTERMEDIATE_DIR)/brave/web-ui-brave_wallet_swap_page/brave_wallet_swap_page.grd": {
     "META": {"sizes": {"includes": [100]}},
     "includes": [34250],