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

Unified Diff: ios/web/ios_web.gyp

Issue 1048613002: Upstream ios/web/web_state/ui support classes (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: clang format 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 | « no previous file | ios/web/web_state/ui/crw_context_menu_provider.h » ('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 f661363a81a66e1203c1871e70d59f7783c64ba2..07a0ffd6aa4a53afbd81de889c6fe6a8c030e857 100644
--- a/ios/web/ios_web.gyp
+++ b/ios/web/ios_web.gyp
@@ -15,6 +15,7 @@
],
'dependencies': [
'ios_web_core',
+ 'user_agent',
'../../base/base.gyp:base',
'../../content/content.gyp:content_browser',
'../../net/net.gyp:net',
@@ -101,16 +102,39 @@
'web_state/js/crw_js_message_manager.mm',
'web_state/js/page_script_util.h',
'web_state/js/page_script_util.mm',
+ 'web_state/ui/crw_context_menu_provider.h',
+ 'web_state/ui/crw_context_menu_provider.mm',
+ '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/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',
+ 'web_state/ui/crw_ui_simple_web_view_controller.h',
+ 'web_state/ui/crw_ui_simple_web_view_controller.mm',
+ 'web_state/ui/crw_wk_simple_web_view_controller.h',
+ 'web_state/ui/crw_wk_simple_web_view_controller.mm',
+ 'web_state/ui/crw_wk_web_view_crash_detector.h',
+ '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_thread.cc',
'web_thread_impl.cc',
'web_thread_impl.h',
'web_view_util.h',
'web_view_util.mm',
],
+ 'link_settings': {
+ 'xcode_settings': {
+ 'OTHER_LDFLAGS': [
+ '-weak_framework WebKit',
+ ]
+ },
+ },
},
# Target shared by ios_web and CrNet.
{
@@ -177,5 +201,19 @@
'test/test_web_thread_bundle.cc',
],
},
+ {
+ 'target_name': 'user_agent',
+ 'type': 'static_library',
+ 'include_dirs': [
+ '../..',
+ ],
+ 'dependencies': [
+ '../../base/base.gyp:base'
+ ],
+ 'sources': [
+ 'public/user_agent.h',
+ 'public/user_agent.mm',
+ ],
+ },
],
}
« no previous file with comments | « no previous file | ios/web/web_state/ui/crw_context_menu_provider.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698