diff options
| author | joaodasilva@chromium.org <joaodasilva@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-22 18:25:42 +0000 |
|---|---|---|
| committer | joaodasilva@chromium.org <joaodasilva@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-22 18:25:42 +0000 |
| commit | da15aa3f93e7b27156e2f22a6bbaa659d3cbacdf (patch) | |
| tree | 2e4866ed62cf93d4347da97da8723babbbbfb09e /build/ios | |
| parent | a41b6f8b9d7c7fcab48e1e7c752813e4d242e660 (diff) | |
| download | chromium_src-da15aa3f93e7b27156e2f22a6bbaa659d3cbacdf.zip chromium_src-da15aa3f93e7b27156e2f22a6bbaa659d3cbacdf.tar.gz chromium_src-da15aa3f93e7b27156e2f22a6bbaa659d3cbacdf.tar.bz2 | |
More fixes to enable ios build with policy.
This change fixes //chrome code that breaks when built with policy enabled
on ios.
BUG=275292
Review URL: https://codereview.chromium.org/138163015
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@246375 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build/ios')
| -rw-r--r-- | build/ios/grit_whitelist.txt | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/build/ios/grit_whitelist.txt b/build/ios/grit_whitelist.txt index 2311b0e..ba61f04 100644 --- a/build/ios/grit_whitelist.txt +++ b/build/ios/grit_whitelist.txt @@ -693,6 +693,7 @@ IDS_PDF_INFOBAR_ALWAYS_USE_READER_BUTTON IDS_PLATFORM_LABEL IDS_PLUGIN_CONFIRM_INSTALL_DIALOG_ACCEPT_BUTTON IDS_PLUGIN_CONFIRM_INSTALL_DIALOG_TITLE +IDS_POLICY_DEFAULT_SEARCH_DISABLED IDS_POLICY_DEPRECATED IDS_POLICY_DM_STATUS_HTTP_STATUS_ERROR IDS_POLICY_DM_STATUS_REQUEST_FAILED @@ -710,8 +711,19 @@ IDS_POLICY_DM_STATUS_SERVICE_POLICY_NOT_FOUND IDS_POLICY_DM_STATUS_SUCCESS IDS_POLICY_DM_STATUS_TEMPORARY_UNAVAILABLE IDS_POLICY_DM_STATUS_UNKNOWN_ERROR +IDS_POLICY_INVALID_PROXY_MODE_ERROR +IDS_POLICY_INVALID_SEARCH_URL_ERROR IDS_POLICY_LIST_ENTRY_ERROR +IDS_POLICY_NOT_SPECIFIED_ERROR IDS_POLICY_OUT_OF_RANGE_ERROR +IDS_POLICY_OVERRIDDEN +IDS_POLICY_PROXY_BOTH_SPECIFIED_ERROR +IDS_POLICY_PROXY_MODE_AUTO_DETECT_ERROR +IDS_POLICY_PROXY_MODE_DISABLED_ERROR +IDS_POLICY_PROXY_MODE_FIXED_SERVERS_ERROR +IDS_POLICY_PROXY_MODE_PAC_URL_ERROR +IDS_POLICY_PROXY_MODE_SYSTEM_ERROR +IDS_POLICY_PROXY_NEITHER_SPECIFIED_ERROR IDS_POLICY_STORE_STATUS_BAD_STATE IDS_POLICY_STORE_STATUS_LOAD_ERROR IDS_POLICY_STORE_STATUS_OK |