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

Unified Diff: ios/web/ios_web.gyp

Issue 988383002: Upstream various ios/web utilities and helpers (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@web-public-upstreaming
Patch Set: 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
Index: ios/web/ios_web.gyp
diff --git a/ios/web/ios_web.gyp b/ios/web/ios_web.gyp
index 37545c924656399e21825e533ea22803b0722440..5e208e9607b0ee83828fc8ea237fdbf74011846b 100644
--- a/ios/web/ios_web.gyp
+++ b/ios/web/ios_web.gyp
@@ -14,6 +14,7 @@
'../..',
],
'dependencies': [
+ 'ios_web_core',
'../../base/base.gyp:base',
'../../content/content.gyp:content_browser',
'../../net/net.gyp:net',
@@ -25,8 +26,14 @@
'load_committed_details.cc',
'navigation/navigation_item_impl.h',
'navigation/navigation_item_impl.mm',
+ 'navigation/nscoder_util.h',
+ 'navigation/nscoder_util.mm',
+ 'navigation/time_smoother.cc',
+ 'navigation/time_smoother.h',
'net/cert_policy.cc',
'net/certificate_policy_cache.cc',
+ 'net/request_group_util.h',
+ 'net/request_group_util.mm',
'public/block_types.h',
'public/browser_state.h',
'public/browser_url_rewriter.h',
@@ -74,6 +81,11 @@
'url_scheme_util.mm',
'url_util.cc',
'user_metrics.cc',
+ 'weak_nsobject_counter.h',
+ 'weak_nsobject_counter.mm',
+ 'web_state/blocked_popup_info.h',
+ 'web_state/blocked_popup_info.mm',
+ 'web_state/crw_recurring_task_delegate.h',
'web_state/js/crw_js_base_manager.mm',
'web_state/js/crw_js_common_manager.h',
'web_state/js/crw_js_common_manager.mm',
@@ -85,6 +97,8 @@
'web_state/js/crw_js_message_manager.mm',
'web_state/web_state_observer.cc',
'web_state/web_state_observer_bridge.mm',
+ 'web_state/wk_web_view_ssl_error_util.h',
+ 'web_state/wk_web_view_ssl_error_util.mm',
'web_thread.cc',
'web_thread_impl.cc',
'web_thread_impl.h',
@@ -92,6 +106,23 @@
'web_view_util.mm',
],
},
+ # Target shared by ios_web and CrNet.
+ {
+ 'target_name': 'ios_web_core',
+ 'type': 'static_library',
+ 'dependencies': [
+ '../../base/base.gyp:base',
+ ],
+ 'include_dirs': [
+ '../..',
+ ],
+ 'sources': [
+ 'crw_network_activity_indicator_manager.h',
+ 'crw_network_activity_indicator_manager.mm',
+ 'history_state_util.h',
+ 'history_state_util.mm',
+ ],
+ },
{
'target_name': 'js_resources',
'type': 'none',

Powered by Google App Engine
This is Rietveld 408576698