Override chromium's generated_resources.h to include brave_generated_…

…resource.h without patching
brave · Jun 26, 2018 · 5b4838a · 5b4838a
1 parent c209131
commit 5b4838a
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 12 deletions.
diff --git a/build/BUILD.gn b/build/BUILD.gn
@@ -1,6 +1,7 @@
 # Changing these will cause a full rebuild
 brave_include_dirs_ = [
   "//brave/chromium_src",
+  root_out_dir,
 ]
 
 config("brave_include_dirs") {

diff --git a/chromium_src/chrome/grit/generated_resources.h b/chromium_src/chrome/grit/generated_resources.h
@@ -0,0 +1,2 @@
+#include "brave/grit/brave_generated_resources.h"
+#include "gen/chrome/grit/generated_resources.h"
diff --git a/patches/chrome-browser-ui-webui-settings-md_settings_localized_strings_provider.cc.patch b/patches/chrome-browser-ui-webui-settings-md_settings_localized_strings_provider.cc.patch
@@ -1,18 +1,8 @@
 diff --git a/chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc b/chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc
-index 6ee8837135be6b1f9389827dac26ecfa5a2a4fd6..4b68be2a2010f313056c2f51b5cd55a1f7eb7715 100644
+index 6ee8837135be6b1f9389827dac26ecfa5a2a4fd6..e38da9061e07072a56fc4b3a82a0dcff20a2d0bf 100644
 --- a/chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc
 +++ b/chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc
-@@ -10,6 +10,9 @@
- #include "base/i18n/number_formatting.h"
- #include "base/strings/string_number_conversions.h"
- #include "base/strings/utf_string_conversions.h"
-+#if defined(BRAVE_CHROMIUM_BUILD)
-+#include "brave/grit/brave_generated_resources.h"
-+#endif
- #include "build/build_config.h"
- #include "build/buildflag.h"
- #include "chrome/browser/browser_process.h"
-@@ -996,6 +999,7 @@ void AddImportDataStrings(content::WebUIDataSource* html_source) {
+@@ -996,6 +996,7 @@ void AddImportDataStrings(content::WebUIDataSource* html_source) {
      {"importPasswords", IDS_SETTINGS_IMPORT_PASSWORDS_CHECKBOX},
      {"importSearch", IDS_SETTINGS_IMPORT_SEARCH_ENGINES_CHECKBOX},
      {"importAutofillFormData", IDS_SETTINGS_IMPORT_AUTOFILL_FORM_DATA_CHECKBOX},
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		#include "brave/grit/brave_generated_resources.h"
		#include "gen/chrome/grit/generated_resources.h"