diff options
| author | Torne (Richard Coles) <torne@google.com> | 2013-12-18 16:25:09 +0000 |
|---|---|---|
| committer | Torne (Richard Coles) <torne@google.com> | 2013-12-18 16:25:09 +0000 |
| commit | a3f6a49ab37290eeeb8db0f41ec0f1cb74a68be7 (patch) | |
| tree | dafc1c6417406a7fbd422ad0bb890e96909ef564 /android_webview/android_webview.gyp | |
| parent | d5f893c0bc79db3066bb5ae5d3d972ba1be7dd5f (diff) | |
| download | chromium_org-a3f6a49ab37290eeeb8db0f41ec0f1cb74a68be7.tar.gz | |
Merge from Chromium at DEPS revision 240154
This commit was generated by merge_to_master.py.
Change-Id: I8f2ba858cf0e7f413dddedc2ae91dc37f7136c2e
Diffstat (limited to 'android_webview/android_webview.gyp')
| -rw-r--r-- | android_webview/android_webview.gyp | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/android_webview/android_webview.gyp b/android_webview/android_webview.gyp index 6abe19f770..941aaa3913 100644 --- a/android_webview/android_webview.gyp +++ b/android_webview/android_webview.gyp @@ -99,7 +99,9 @@ '../content/content.gyp:content_app_both', '../gpu/gpu.gyp:command_buffer_service', '../gpu/gpu.gyp:gles2_implementation', + '../printing/printing.gyp:printing', '../skia/skia.gyp:skia', + '../third_party/WebKit/public/blink.gyp:blink', '../ui/gl/gl.gyp:gl', '../ui/shell_dialogs/shell_dialogs.gyp:shell_dialogs', '../webkit/common/gpu/webkit_gpu.gyp:webkit_gpu', @@ -142,6 +144,8 @@ 'browser/aw_quota_permission_context.h', 'browser/aw_request_interceptor.cc', 'browser/aw_request_interceptor.h', + 'browser/aw_resource_context.cc', + 'browser/aw_resource_context.h', 'browser/aw_result_codes.h', 'browser/aw_web_preferences_populater.cc', 'browser/aw_web_preferences_populater.h', @@ -177,6 +181,8 @@ 'browser/renderer_host/aw_render_view_host_ext.h', 'browser/renderer_host/aw_resource_dispatcher_host_delegate.cc', 'browser/renderer_host/aw_resource_dispatcher_host_delegate.h', + 'browser/renderer_host/print_manager.cc', + 'browser/renderer_host/print_manager.h', 'browser/scoped_allow_wait_for_legacy_web_view_api.h', 'browser/scoped_app_gl_state_restore.cc', 'browser/scoped_app_gl_state_restore.h', @@ -189,6 +195,8 @@ 'common/aw_resource.h', 'common/aw_switches.cc', 'common/aw_switches.h', + 'common/print_messages.cc', + 'common/print_messages.h', 'common/render_view_messages.cc', 'common/render_view_messages.h', 'common/url_constants.cc', @@ -206,6 +214,10 @@ 'renderer/aw_render_process_observer.h', 'renderer/aw_render_view_ext.cc', 'renderer/aw_render_view_ext.h', + 'renderer/print_web_view_helper.cc', + 'renderer/print_web_view_helper.h', + 'renderer/print_web_view_helper_android.cc', + 'renderer/print_web_view_helper_linux.cc', ], }, { |