diff options
| author | rtenneti@chromium.org <rtenneti@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-13 02:44:55 +0000 |
|---|---|---|
| committer | rtenneti@chromium.org <rtenneti@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-13 02:44:55 +0000 |
| commit | c196eead2d9c9bbc879a97a8fb3c30d24e6de934 (patch) | |
| tree | 1ae33830f1120357affc6fd9233d50365961210c /build | |
| parent | cd48d688a68cb5136b223eac6ae85cf2b849059e (diff) | |
| download | chromium_src-c196eead2d9c9bbc879a97a8fb3c30d24e6de934.zip chromium_src-c196eead2d9c9bbc879a97a8fb3c30d24e6de934.tar.gz chromium_src-c196eead2d9c9bbc879a97a8fb3c30d24e6de934.tar.bz2 | |
Changes to compile connection_tester on iOS and adding
of net_internal's HTML and JS to ios's grit_whitelist.
Disabled Firefox settings for iOS ala Android.
Set FTP transaction factory if DISABLE_FTP_SUPPORT is not set.
Used ProxyService::CreateUsingSystemProxyResolver instead of
net::CreateProxyServiceUsingV8ProxyResolver because V8 is
used on IPHone.
Temporarily ifdef'ed out webkit_glue::ResourceLoadTimingInfo
for IOS in load_timing_observer. load_timing_observer is going
away per mmenke. Thus change to load_timing_observer.h and
load_timing_observer.cc will be deleted.
R=droger@chromium.org, mmenke@chromium.org
BUG=151212
Review URL: https://chromiumcodereview.appspot.com/11450023
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@172789 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
| -rw-r--r-- | build/ios/grit_whitelist.txt | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/build/ios/grit_whitelist.txt b/build/ios/grit_whitelist.txt index 4f50239..e352eea 100644 --- a/build/ios/grit_whitelist.txt +++ b/build/ios/grit_whitelist.txt @@ -16,6 +16,10 @@ IDR_INFOBAR_SAVE_PASSWORD IDR_INPUT_ALERT IDR_JSTEMPLATE_JS IDR_NET_ERROR_HTML +IDR_NET_INTERNALS_HELP_HTML +IDR_NET_INTERNALS_HELP_JS +IDR_NET_INTERNALS_INDEX_HTML +IDR_NET_INTERNALS_INDEX_JS IDR_OMAHA_HTML IDR_OMAHA_JS IDR_OMNIBOX_EXTENSION_APP @@ -33,6 +37,7 @@ IDR_PAGEINFO_WARNING_MINOR IDR_PRERENDER IDR_PRODUCT_LOGO_26 IDR_SAD_TAB +IDR_SHARED_IMAGES_SELECT IDR_SHARED_JS_LOAD_TIME_DATA IDR_SHARED_JS_UTIL IDR_SSL_ERROR_HTML |