diff options
| author | sdefresne <sdefresne@chromium.org> | 2015-11-16 13:47:29 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-11-16 21:48:55 +0000 |
| commit | 246c564da980b3dbbd0a062688ec65539b4b2c35 (patch) | |
| tree | 81c60249e1062a54fc42c70c9fe2b95ee8bdc0a8 /build | |
| parent | 049217061cbe1c5bfcda950cab2a054725678c73 (diff) | |
| download | chromium_src-246c564da980b3dbbd0a062688ec65539b4b2c35.zip chromium_src-246c564da980b3dbbd0a062688ec65539b4b2c35.tar.gz chromium_src-246c564da980b3dbbd0a062688ec65539b4b2c35.tar.bz2 | |
Componentize about_flags::FeatureEntry in flags_ui component.
Move FeatureEntry structure definition to components/flags_ui so that
it can be shared with iOS and move the helper macros to a secondary
header file for the same reason.
Move IDS_GENERIC_EXPERIMENT_CHOICE_* strings to flags_ui.grdp.
BUG=551954
Review URL: https://codereview.chromium.org/1415953005
Cr-Commit-Position: refs/heads/master@{#359927}
Diffstat (limited to 'build')
| -rw-r--r-- | build/ios/grit_whitelist.txt | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/build/ios/grit_whitelist.txt b/build/ios/grit_whitelist.txt index 943929d..af3c962 100644 --- a/build/ios/grit_whitelist.txt +++ b/build/ios/grit_whitelist.txt @@ -426,10 +426,6 @@ IDS_FLAGS_WALLET_SERVICE_USE_SANDBOX_NAME IDS_FLAGS_WARNING_HEADER IDS_FLAGS_WARNING_TEXT IDS_FULLSCREEN -IDS_GENERIC_EXPERIMENT_CHOICE_AUTOMATIC -IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT -IDS_GENERIC_EXPERIMENT_CHOICE_DISABLED -IDS_GENERIC_EXPERIMENT_CHOICE_ENABLED IDS_GROUP_BY_DOMAIN_LABEL IDS_GUEST_PROFILE_NAME IDS_HARMFUL_V3_EXPLANATION_PARAGRAPH |