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

Side by Side Diff: android_webview/android_webview.gyp

Issue 532313002: Revert "[Android WebView] Terminate execution of stuck JS code on navigation requests" (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@2125
Patch Set: Created 6 years, 3 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 unified diff | Download patch
« no previous file with comments | « no previous file | android_webview/browser/renderer_host/aw_render_view_host_ext.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright 2009 The Chromium Authors. All rights reserved. 1 # Copyright 2009 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 { 4 {
5 'variables': { 5 'variables': {
6 'chromium_code': 1, 6 'chromium_code': 1,
7 }, 7 },
8 'targets': [ 8 'targets': [
9 { 9 {
10 'target_name': 'libwebviewchromium', 10 'target_name': 'libwebviewchromium',
(...skipping 100 matching lines...) Expand 10 before | Expand all | Expand 10 after
111 '../content/content.gyp:content_app_both', 111 '../content/content.gyp:content_app_both',
112 '../content/content.gyp:content_browser', 112 '../content/content.gyp:content_browser',
113 '../gpu/command_buffer/command_buffer.gyp:gles2_utils', 113 '../gpu/command_buffer/command_buffer.gyp:gles2_utils',
114 '../gpu/gpu.gyp:command_buffer_service', 114 '../gpu/gpu.gyp:command_buffer_service',
115 '../gpu/gpu.gyp:gles2_implementation', 115 '../gpu/gpu.gyp:gles2_implementation',
116 '../gpu/gpu.gyp:gl_in_process_context', 116 '../gpu/gpu.gyp:gl_in_process_context',
117 '../media/media.gyp:media', 117 '../media/media.gyp:media',
118 '../printing/printing.gyp:printing', 118 '../printing/printing.gyp:printing',
119 '../skia/skia.gyp:skia', 119 '../skia/skia.gyp:skia',
120 '../third_party/WebKit/public/blink.gyp:blink', 120 '../third_party/WebKit/public/blink.gyp:blink',
121 '../v8/tools/gyp/v8.gyp:v8',
122 '../ui/gl/gl.gyp:gl', 121 '../ui/gl/gl.gyp:gl',
123 '../ui/shell_dialogs/shell_dialogs.gyp:shell_dialogs', 122 '../ui/shell_dialogs/shell_dialogs.gyp:shell_dialogs',
124 '../webkit/common/gpu/webkit_gpu.gyp:webkit_gpu', 123 '../webkit/common/gpu/webkit_gpu.gyp:webkit_gpu',
125 'android_webview_pak', 124 'android_webview_pak',
126 ], 125 ],
127 'include_dirs': [ 126 'include_dirs': [
128 '..', 127 '..',
129 '../skia/config', 128 '../skia/config',
130 '<(SHARED_INTERMEDIATE_DIR)/ui/resources/', 129 '<(SHARED_INTERMEDIATE_DIR)/ui/resources/',
131 ], 130 ],
(...skipping 101 matching lines...) Expand 10 before | Expand all | Expand 10 after
233 'common/render_view_messages.h', 232 'common/render_view_messages.h',
234 'common/url_constants.cc', 233 'common/url_constants.cc',
235 'common/url_constants.h', 234 'common/url_constants.h',
236 'lib/aw_browser_dependency_factory_impl.cc', 235 'lib/aw_browser_dependency_factory_impl.cc',
237 'lib/aw_browser_dependency_factory_impl.h', 236 'lib/aw_browser_dependency_factory_impl.h',
238 'lib/main/aw_main_delegate.cc', 237 'lib/main/aw_main_delegate.cc',
239 'lib/main/aw_main_delegate.h', 238 'lib/main/aw_main_delegate.h',
240 'public/browser/draw_gl.h', 239 'public/browser/draw_gl.h',
241 'renderer/aw_content_renderer_client.cc', 240 'renderer/aw_content_renderer_client.cc',
242 'renderer/aw_content_renderer_client.h', 241 'renderer/aw_content_renderer_client.h',
243 'renderer/aw_execution_termination_filter.cc',
244 'renderer/aw_execution_termination_filter.h',
245 'renderer/aw_key_systems.cc', 242 'renderer/aw_key_systems.cc',
246 'renderer/aw_key_systems.h', 243 'renderer/aw_key_systems.h',
247 'renderer/aw_permission_client.cc', 244 'renderer/aw_permission_client.cc',
248 'renderer/aw_permission_client.h', 245 'renderer/aw_permission_client.h',
249 'renderer/aw_render_process_observer.cc', 246 'renderer/aw_render_process_observer.cc',
250 'renderer/aw_render_process_observer.h', 247 'renderer/aw_render_process_observer.h',
251 'renderer/aw_render_frame_ext.cc', 248 'renderer/aw_render_frame_ext.cc',
252 'renderer/aw_render_frame_ext.h', 249 'renderer/aw_render_frame_ext.h',
253 'renderer/aw_render_view_ext.cc', 250 'renderer/aw_render_view_ext.cc',
254 'renderer/aw_render_view_ext.h', 251 'renderer/aw_render_view_ext.h',
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
312 '../content/content.gyp:content_strings_grd', 309 '../content/content.gyp:content_strings_grd',
313 '../ui/android/ui_android.gyp:ui_strings_grd', 310 '../ui/android/ui_android.gyp:ui_strings_grd',
314 'android_webview_jarjar_ui_resources', 311 'android_webview_jarjar_ui_resources',
315 'android_webview_jarjar_content_resources' 312 'android_webview_jarjar_content_resources'
316 ], 313 ],
317 }, 314 },
318 ], 315 ],
319 }], 316 }],
320 ], 317 ],
321 } 318 }
OLDNEW
« no previous file with comments | « no previous file | android_webview/browser/renderer_host/aw_render_view_host_ext.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698