From fce3426675b48c8a80d98f11234d55c896f593d2 Mon Sep 17 00:00:00 2001 From: "trop[bot]" <37223003+trop[bot]@users.noreply.github.com> Date: Tue, 11 Feb 2020 15:47:55 -0800 Subject: [PATCH] build: fix spellchecker deps (#22154) Co-authored-by: Alexey Kuzmin --- ...esources_not_chrome_for_spellchecker.patch | 24 +++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/patches/chromium/chore_use_electron_resources_not_chrome_for_spellchecker.patch b/patches/chromium/chore_use_electron_resources_not_chrome_for_spellchecker.patch index e54f339d6d6c6..f18abf6fc8a6c 100644 --- a/patches/chromium/chore_use_electron_resources_not_chrome_for_spellchecker.patch +++ b/patches/chromium/chore_use_electron_resources_not_chrome_for_spellchecker.patch @@ -6,6 +6,18 @@ Subject: chore: use electron resources not chrome for spellchecker spellchecker uses a few IDS_ resources. We need to load these from Electrons grit header instead of Chromes +diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn +index d730660c086f..ba9b098d848e 100644 +--- a/chrome/browser/BUILD.gn ++++ b/chrome/browser/BUILD.gn +@@ -5049,6 +5049,7 @@ jumbo_split_static_library("browser") { + deps += [ + "//components/spellcheck/browser", + "//components/spellcheck/common", ++ "//electron:resources", + ] + + if (!is_android) { diff --git a/chrome/browser/spellchecker/spellcheck_factory.cc b/chrome/browser/spellchecker/spellcheck_factory.cc index 48ac0a24efde0cb7d3ba71c8b8bdf5178f606e80..e2beefc276098fdc8f1cdab2e0edb8fae4ee67ca 100644 --- a/chrome/browser/spellchecker/spellcheck_factory.cc @@ -19,6 +31,18 @@ index 48ac0a24efde0cb7d3ba71c8b8bdf5178f606e80..e2beefc276098fdc8f1cdab2e0edb8fa #include "components/keyed_service/content/browser_context_dependency_manager.h" #include "components/pref_registry/pref_registry_syncable.h" #include "components/prefs/pref_service.h" +diff --git a/components/language/core/browser/BUILD.gn b/components/language/core/browser/BUILD.gn +index f28230ea94fe..c10eea103852 100644 +--- a/components/language/core/browser/BUILD.gn ++++ b/components/language/core/browser/BUILD.gn +@@ -31,6 +31,7 @@ static_library("browser") { + "//components/pref_registry", + "//components/prefs", + "//components/strings", ++ "//electron:resources", + "//ui/base", + ] + } diff --git a/components/language/core/browser/language_prefs.cc b/components/language/core/browser/language_prefs.cc index 4fd35c8d5bba01c25c906b19bb251222ba3d25b4..4770f0d6a8d145e5d16931d5caf4f1f85abead20 100644 --- a/components/language/core/browser/language_prefs.cc