From 7807dc30a3bf812e716ac8efcf9c48a675e9e170 Mon Sep 17 00:00:00 2001 From: sdefresne Date: Thu, 11 Feb 2016 12:00:28 -0800 Subject: Componentize Chrome terms of service, Accept-Languages & default encoding. In order to share those strings with Chrome on iOS, componentize the strings IDS_TERMS_HTML, IDS_ACCEPT_LANGUAGES, IDS_DEFAULT_ENCODING. Remove usafe of IDS_IOS_ACCEPT_LANGUAGES and IDS_IOS_DEFAULT_ENCODING as they are duplicates of the newly componentized strings (but do not remove them yet as they are still used downstream). Fix the script packing the resources to pack those new generated .pak files for both iOS and other platforms. BUG=568486 Review URL: https://codereview.chromium.org/1679283002 Cr-Commit-Position: refs/heads/master@{#374951} --- ios/chrome/browser/variations/BUILD.gn | 2 ++ 1 file changed, 2 insertions(+) (limited to 'ios/chrome/browser/variations') diff --git a/ios/chrome/browser/variations/BUILD.gn b/ios/chrome/browser/variations/BUILD.gn index 3998d28..dbd5aa7 100644 --- a/ios/chrome/browser/variations/BUILD.gn +++ b/ios/chrome/browser/variations/BUILD.gn @@ -8,6 +8,7 @@ generate_ui_string_overrider("ios_chrome_ui_string_overrider_factory") { inputs = [ "$root_gen_dir/components/strings/grit/components_chromium_strings.h", "$root_gen_dir/components/strings/grit/components_google_chrome_strings.h", + "$root_gen_dir/components/strings/grit/components_locale_settings.h", "$root_gen_dir/components/strings/grit/components_strings.h", "$root_gen_dir/ios/chrome/grit/ios_chromium_strings.h", "$root_gen_dir/ios/chrome/grit/ios_google_chrome_strings.h", @@ -17,6 +18,7 @@ generate_ui_string_overrider("ios_chrome_ui_string_overrider_factory") { deps = [ "//components/strings:components_chromium_strings", "//components/strings:components_google_chrome_strings", + "//components/strings:components_locale_settings", "//components/strings:components_strings", "//ios/chrome/app/strings:ios_chromium_strings", "//ios/chrome/app/strings:ios_google_chrome_strings", -- cgit v1.1