diff --git a/brave_paks.gni b/brave_paks.gni index c4d4a9a24539..b19f5aca4940 100644 --- a/brave_paks.gni +++ b/brave_paks.gni @@ -90,12 +90,12 @@ template("brave_extra_paks") { if (enable_extensions) { sources += [ - "$root_gen_dir/brave/browser/resources/md_extensions/brave_extensions_resources.pak", + "$root_gen_dir/brave/browser/resources/extensions/brave_extensions_resources.pak", "$root_gen_dir/brave/components/brave_extension/brave_extension_resources.pak", ] deps += [ - "//brave/browser/resources/md_extensions:resources", + "//brave/browser/resources/extensions:resources", "//brave/common/extensions/api", "//brave/components/brave_extension:resources", ] diff --git a/browser/resources/md_extensions/BUILD.gn b/browser/resources/extensions/BUILD.gn similarity index 86% rename from browser/resources/md_extensions/BUILD.gn rename to browser/resources/extensions/BUILD.gn index 698018150d84..e90f4396b424 100644 --- a/browser/resources/md_extensions/BUILD.gn +++ b/browser/resources/extensions/BUILD.gn @@ -14,7 +14,7 @@ grit("resources") { "brave_extensions_resources.pak", ] - output_dir = "$root_gen_dir/brave/browser/resources/md_extensions" + output_dir = "$root_gen_dir/brave/browser/resources/extensions" resource_ids = "//brave/browser/resources/resource_ids" } @@ -28,7 +28,7 @@ action("unpak_brave_extensions_resources") { script = "//chrome/browser/resources/unpack_pak.py" pak_file = "brave_extensions_resources.pak" - out_folder = "$root_gen_dir/chrome/browser/resources/md_extensions/extensions_resources.unpak" + out_folder = "$root_gen_dir/chrome/browser/resources/extensions/extensions_resources.unpak" inputs = [ "$target_gen_dir/brave_extensions_resources.pak", diff --git a/browser/resources/md_extensions/brave_item_list_more_items.html b/browser/resources/extensions/brave_item_list_more_items.html similarity index 100% rename from browser/resources/md_extensions/brave_item_list_more_items.html rename to browser/resources/extensions/brave_item_list_more_items.html diff --git a/browser/resources/md_extensions/brave_item_list_more_items.js b/browser/resources/extensions/brave_item_list_more_items.js similarity index 100% rename from browser/resources/md_extensions/brave_item_list_more_items.js rename to browser/resources/extensions/brave_item_list_more_items.js diff --git a/browser/resources/md_extensions/brave_unpack.stamp b/browser/resources/extensions/brave_unpack.stamp similarity index 100% rename from browser/resources/md_extensions/brave_unpack.stamp rename to browser/resources/extensions/brave_unpack.stamp diff --git a/browser/resources/md_extensions/extensions_resources.grd b/browser/resources/extensions/extensions_resources.grd similarity index 100% rename from browser/resources/md_extensions/extensions_resources.grd rename to browser/resources/extensions/extensions_resources.grd diff --git a/browser/resources/resource_ids b/browser/resources/resource_ids index 5d75fa0b97da..4e11a58d6eea 100644 --- a/browser/resources/resource_ids +++ b/browser/resources/resource_ids @@ -80,7 +80,7 @@ "includes": [41000], "structures": [42000], }, - "brave/browser/resources/md_extensions/extensions_resources.grd": { + "brave/browser/resources/extensions/extensions_resources.grd": { "structures": [43000], "includes": [43500], }, diff --git a/browser/ui/BUILD.gn b/browser/ui/BUILD.gn index 13d67317714d..0273b9ec0dea 100644 --- a/browser/ui/BUILD.gn +++ b/browser/ui/BUILD.gn @@ -166,7 +166,7 @@ source_set("ui") { ] deps += [ - "//brave/browser/resources/md_extensions:resources", + "//brave/browser/resources/extensions:resources", "//brave/components/brave_extension:static_resources", "//brave/components/brave_extension:generated_resources", "//chrome/browser/extensions", diff --git a/chromium_src/chrome/browser/ui/webui/extensions/extensions_ui.cc b/chromium_src/chrome/browser/ui/webui/extensions/extensions_ui.cc index c2531d8a47a4..a4f7b74ed0b9 100644 --- a/chromium_src/chrome/browser/ui/webui/extensions/extensions_ui.cc +++ b/chromium_src/chrome/browser/ui/webui/extensions/extensions_ui.cc @@ -3,8 +3,8 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at http://mozilla.org/MPL/2.0/. */ -#include "brave/browser/resources/md_extensions/grit/brave_extensions_resources.h" -#include "brave/browser/resources/md_extensions/grit/brave_extensions_resources_map.h" +#include "brave/browser/resources/extensions/grit/brave_extensions_resources.h" +#include "brave/browser/resources/extensions/grit/brave_extensions_resources_map.h" #include "brave/browser/ui/webui/navigation_bar_data_provider.h" #include "brave/grit/brave_generated_resources.h" #include "chrome/common/buildflags.h" diff --git a/patches/chrome-browser-resources-extensions-BUILD.gn.patch b/patches/chrome-browser-resources-extensions-BUILD.gn.patch index e6fed34fa955..5fe06ba91faf 100644 --- a/patches/chrome-browser-resources-extensions-BUILD.gn.patch +++ b/patches/chrome-browser-resources-extensions-BUILD.gn.patch @@ -6,7 +6,7 @@ index 8e92d58854d55a27e53d4a2b93bb299149ff4c95..aa6d8ca5cd9ec78bdbd9d93e7cbc6da6 deps = [ ":unpak", -+ "//brave/browser/resources/md_extensions:unpak", ++ "//brave/browser/resources/extensions:unpak", ] }