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

Unified Diff: ios/web/ios_web.gyp

Issue 1110213002: Upstream most of the iOS WebUI support in ios/web/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 8 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 2cf527196a47a0db5fdf42a16bf952dc3e0f7ff3..e0de21ed7c8b4002d60d65a9610e86e09b18bc46 100644
--- a/ios/web/ios_web.gyp
+++ b/ios/web/ios_web.gyp
@@ -24,6 +24,8 @@
'../../net/net.gyp:net',
'../../ui/base/ui_base.gyp:ui_base',
'../../ui/gfx/gfx.gyp:gfx',
+ '../../ui/gfx/gfx.gyp:gfx_geometry',
+ '../../ui/resources/ui_resources.gyp:ui_resources',
'../../url/url.gyp:url_lib',
],
'sources': [
@@ -88,6 +90,7 @@
'public/user_agent.h',
'public/user_agent.mm',
'public/user_metrics.h',
+ 'public/web/url_data_source_ios.h',
'public/web_client.h',
'public/web_client.mm',
'public/web_state/credential.h',
@@ -108,6 +111,7 @@
'public/web_state/web_state_observer.h',
'public/web_state/web_state_observer_bridge.h',
'public/web_thread.h',
+ 'public/web_ui_ios_data_source.h',
'public/web_view_type.h',
'public/web_view_util.h',
'string_util.cc',
@@ -143,10 +147,6 @@
'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',
- 'web_state/wk_web_view_ssl_error_util.mm',
'web_state/ui/crw_swipe_recognizer_provider.h',
'web_state/ui/crw_touch_tracking_recognizer.h',
'web_state/ui/crw_touch_tracking_recognizer.mm',
@@ -158,10 +158,32 @@
'web_state/ui/crw_wk_web_view_crash_detector.mm',
'web_state/ui/web_view_js_utils.h',
'web_state/ui/web_view_js_utils.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',
'web_view_util.mm',
+ 'webui/crw_web_ui_page_builder.h',
+ 'webui/crw_web_ui_page_builder.mm',
+ 'webui/shared_resources_data_source_ios.cc',
+ 'webui/shared_resources_data_source_ios.h',
+ 'webui/url_data_manager_ios.cc',
+ 'webui/url_data_manager_ios.h',
+ 'webui/url_data_manager_ios_backend.cc',
+ 'webui/url_data_manager_ios_backend.h',
+ 'webui/url_data_source_ios.cc',
+ 'webui/url_data_source_ios_impl.cc',
+ 'webui/url_data_source_ios_impl.h',
+ 'webui/url_fetcher_block_adapter.h',
+ 'webui/url_fetcher_block_adapter.mm',
+ 'webui/web_ui_ios_controller_factory_registry.cc',
+ 'webui/web_ui_ios_controller_factory_registry.h',
+ 'webui/web_ui_ios_data_source_impl.cc',
+ 'webui/web_ui_ios_data_source_impl.h',
+ '<(SHARED_INTERMEDIATE_DIR)/ui/resources/grit/webui_resources_map.cc',
],
'link_settings': {
'xcode_settings': {

Powered by Google App Engine
This is Rietveld 408576698