Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(222)

Unified Diff: ios/web/ios_web.gyp

Issue 1043243003: Upstream most of ios/web/net (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Remove accidentally-added clients Created 5 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ios/web/browser_state.cc ('k') | ios/web/ios_web_unittests.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ios/web/ios_web.gyp
diff --git a/ios/web/ios_web.gyp b/ios/web/ios_web.gyp
index 137f2c5ff1b8d5ef4cd4f8acbc03a1479a655fea..91005bee1557a1062ad5d08c04f31a79105fe563 100644
--- a/ios/web/ios_web.gyp
+++ b/ios/web/ios_web.gyp
@@ -18,9 +18,12 @@
'user_agent',
'../../base/base.gyp:base',
'../../content/content.gyp:content_browser',
+ '../../ios/net/ios_net.gyp:ios_net',
+ '../../ios/third_party/blink/blink_html_tokenizer.gyp:blink_html_tokenizer',
'../../net/net.gyp:net',
'../../ui/base/ui_base.gyp:ui_base',
'../../ui/gfx/gfx.gyp:gfx',
+ '../../url/url.gyp:url_lib',
],
'sources': [
'browser_state.cc',
@@ -32,13 +35,26 @@
'navigation/time_smoother.cc',
'navigation/time_smoother.h',
'net/cert_policy.cc',
+ 'net/cert_store_impl.cc',
+ 'net/cert_store_impl.h',
'net/certificate_policy_cache.cc',
+ 'net/cookie_notification_bridge.h',
+ 'net/cookie_notification_bridge.mm',
+ 'net/crw_request_tracker_delegate.h',
'net/request_group_util.h',
'net/request_group_util.mm',
+ 'net/request_tracker_data_memoizing_store.h',
+ 'net/request_tracker_factory_impl.h',
+ 'net/request_tracker_factory_impl.mm',
+ 'net/request_tracker_impl.h',
+ 'net/request_tracker_impl.mm',
+ 'net/web_http_protocol_handler_delegate.h',
+ 'net/web_http_protocol_handler_delegate.mm',
'public/block_types.h',
'public/browser_state.h',
'public/browser_url_rewriter.h',
'public/cert_policy.h',
+ 'public/cert_store.h',
'public/certificate_policy_cache.h',
'public/favicon_status.cc',
'public/favicon_status.h',
@@ -83,6 +99,8 @@
'public/web_thread.h',
'public/web_view_type.h',
'string_util.cc',
+ 'ui_web_view_util.h',
+ 'ui_web_view_util.mm',
'url_scheme_util.mm',
'url_util.cc',
'user_metrics.cc',
@@ -101,6 +119,8 @@
'web_state/ui/crw_debug_web_view.h',
'web_state/ui/crw_debug_web_view.mm',
'web_state/ui/crw_simple_web_view_controller.h',
+ 'web_state/ui/crw_static_file_web_view.h',
+ 'web_state/ui/crw_static_file_web_view.mm',
'web_state/web_state_observer.cc',
'web_state/web_state_observer_bridge.mm',
'web_state/wk_web_view_ssl_error_util.h',
@@ -174,8 +194,12 @@
'target_name': 'test_support_ios_web',
'type': 'static_library',
'dependencies': [
- '../../content/content_shell_and_tests.gyp:test_support_content',
'ios_web',
+ '../../content/content_shell_and_tests.gyp:test_support_content',
+ '../../ios/testing/ios_testing.gyp:ocmock_support',
+ '../../testing/gmock.gyp:gmock',
+ '../../testing/gtest.gyp:gtest',
+ '../../third_party/ocmock/ocmock.gyp:ocmock',
],
'include_dirs': [
'../..',
@@ -187,6 +211,8 @@
'public/test/js_test_util.mm',
'public/test/test_browser_state.cc',
'public/test/test_browser_state.h',
+ 'public/test/test_web_client.h',
+ 'public/test/test_web_client.mm',
'public/test/test_web_state.cc',
'public/test/test_web_state.h',
'public/test/test_web_thread.h',
« no previous file with comments | « ios/web/browser_state.cc ('k') | ios/web/ios_web_unittests.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698