Move IME extension IDs out-of-line and use BUILDFLAG instead of global define.

Moving these constants out-of-line means that the dep on
build:branding_buildflags doesn't have to be in public_deps.

No behavior change.

Bug: 961769
Change-Id: I070afcb39d23eee6a1cf0c40e49c064ddc01b353
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1724665Reviewed-by: Yuichiro Hanada <yhanada@chromium.org>
Commit-Queue: Nico Weber <thakis@chromium.org>
Auto-Submit: Nico Weber <thakis@chromium.org>
Cr-Commit-Position: refs/heads/master@{#682240}

ui/base/ime/chromeos/BUILD.gn

@@ -51,6 +51,7 @@ jumbo_component("chromeos") {
   ]
 
   deps = [
+    "//build:branding_buildflags",
     "//chromeos/constants",
     "//chromeos/ime:gencode",
     "//chromeos/services/ime/public/mojom",

ui/base/ime/chromeos/extension_ime_util.cc

@@ -5,6 +5,7 @@
 #include "ui/base/ime/chromeos/extension_ime_util.h"
 
 #include "base/strings/string_util.h"
+#include "build/branding_buildflags.h"
 
 namespace chromeos {
 
@@ -26,6 +27,26 @@ const int kExtensionIdLength = 32;
 
 namespace extension_ime_util {
 
+#if BUILDFLAG(GOOGLE_CHROME_BRANDING)
+const char kXkbExtensionId[] = "jkghodnilhceideoidjikpgommlajknk";
+const char kM17nExtensionId[] = "jkghodnilhceideoidjikpgommlajknk";
+const char kHangulExtensionId[] = "bdgdidmhaijohebebipajioienkglgfo";
+const char kMozcExtensionId[] = "jkghodnilhceideoidjikpgommlajknk";
+const char kT13nExtensionId[] = "jkghodnilhceideoidjikpgommlajknk";
+const char kChinesePinyinExtensionId[] = "jkghodnilhceideoidjikpgommlajknk";
+const char kChineseZhuyinExtensionId[] = "jkghodnilhceideoidjikpgommlajknk";
+const char kChineseCangjieExtensionId[] = "jkghodnilhceideoidjikpgommlajknk";
+#else
+const char kXkbExtensionId[] = "fgoepimhcoialccpbmpnnblemnepkkao";
+const char kM17nExtensionId[] = "jhffeifommiaekmbkkjlpmilogcfdohp";
+const char kHangulExtensionId[] = "bdgdidmhaijohebebipajioienkglgfo";
+const char kMozcExtensionId[] = "bbaiamgfapehflhememkfglaehiobjnk";
+const char kT13nExtensionId[] = "gjaehgfemfahhmlgpdfknkhdnemmolop";
+const char kChinesePinyinExtensionId[] = "cpgalbafkoofkjmaeonnfijgpfennjjn";
+const char kChineseZhuyinExtensionId[] = "ekbifjdfhkmdeeajnolmgdlmkllopefi";
+const char kChineseCangjieExtensionId[] = "aeebooiibjahgpgmhkeocbeekccfknbj";
+#endif
+
 const char kBrailleImeExtensionId[] = "jddehjeebkoimngcbdkaahpobgicbffp";
 const char kBrailleImeExtensionPath[] = "chromeos/braille_ime";
 const char kBrailleImeEngineId[] =

ui/base/ime/chromeos/extension_ime_util.h

@@ -15,25 +15,17 @@ namespace chromeos {
 // Extension IME related utilities.
 namespace extension_ime_util {
 
-#if defined(GOOGLE_CHROME_BUILD)
-const char kXkbExtensionId[] = "jkghodnilhceideoidjikpgommlajknk";
-const char kM17nExtensionId[] = "jkghodnilhceideoidjikpgommlajknk";
-const char kHangulExtensionId[] = "bdgdidmhaijohebebipajioienkglgfo";
-const char kMozcExtensionId[] = "jkghodnilhceideoidjikpgommlajknk";
-const char kT13nExtensionId[] = "jkghodnilhceideoidjikpgommlajknk";
-const char kChinesePinyinExtensionId[] = "jkghodnilhceideoidjikpgommlajknk";
-const char kChineseZhuyinExtensionId[] = "jkghodnilhceideoidjikpgommlajknk";
-const char kChineseCangjieExtensionId[] = "jkghodnilhceideoidjikpgommlajknk";
-#else
-const char kXkbExtensionId[] = "fgoepimhcoialccpbmpnnblemnepkkao";
-const char kM17nExtensionId[] = "jhffeifommiaekmbkkjlpmilogcfdohp";
-const char kHangulExtensionId[] = "bdgdidmhaijohebebipajioienkglgfo";
-const char kMozcExtensionId[] = "bbaiamgfapehflhememkfglaehiobjnk";
-const char kT13nExtensionId[] = "gjaehgfemfahhmlgpdfknkhdnemmolop";
-const char kChinesePinyinExtensionId[] = "cpgalbafkoofkjmaeonnfijgpfennjjn";
-const char kChineseZhuyinExtensionId[] = "ekbifjdfhkmdeeajnolmgdlmkllopefi";
-const char kChineseCangjieExtensionId[] = "aeebooiibjahgpgmhkeocbeekccfknbj";
-#endif
+COMPONENT_EXPORT(UI_BASE_IME_CHROMEOS) extern const char kXkbExtensionId[];
+COMPONENT_EXPORT(UI_BASE_IME_CHROMEOS) extern const char kM17nExtensionId[];
+COMPONENT_EXPORT(UI_BASE_IME_CHROMEOS) extern const char kHangulExtensionId[];
+COMPONENT_EXPORT(UI_BASE_IME_CHROMEOS) extern const char kMozcExtensionId[];
+COMPONENT_EXPORT(UI_BASE_IME_CHROMEOS) extern const char kT13nExtensionId[];
+COMPONENT_EXPORT(UI_BASE_IME_CHROMEOS)
+extern const char kChinesePinyinExtensionId[];
+COMPONENT_EXPORT(UI_BASE_IME_CHROMEOS)
+extern const char kChineseZhuyinExtensionId[];
+COMPONENT_EXPORT(UI_BASE_IME_CHROMEOS)
+extern const char kChineseCangjieExtensionId[];
 
 // Extension id, path (relative to |chrome::DIR_RESOURCES|) and IME engine
 // id for the builtin-in Braille IME extension.