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

Side by Side Diff: android_webview/android_webview.gyp

Issue 534093004: Revert "[Android WebView] Terminate execution of stuck JS code on navigation requests" (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
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 110 matching lines...) Expand 10 before | Expand all | Expand 10 after
121 '../content/content.gyp:content_app_both', 121 '../content/content.gyp:content_app_both',
122 '../content/content.gyp:content_browser', 122 '../content/content.gyp:content_browser',
123 '../gpu/command_buffer/command_buffer.gyp:gles2_utils', 123 '../gpu/command_buffer/command_buffer.gyp:gles2_utils',
124 '../gpu/gpu.gyp:command_buffer_service', 124 '../gpu/gpu.gyp:command_buffer_service',
125 '../gpu/gpu.gyp:gles2_implementation', 125 '../gpu/gpu.gyp:gles2_implementation',
126 '../gpu/gpu.gyp:gl_in_process_context', 126 '../gpu/gpu.gyp:gl_in_process_context',
127 '../media/media.gyp:media', 127 '../media/media.gyp:media',
128 '../printing/printing.gyp:printing', 128 '../printing/printing.gyp:printing',
129 '../skia/skia.gyp:skia', 129 '../skia/skia.gyp:skia',
130 '../third_party/WebKit/public/blink.gyp:blink', 130 '../third_party/WebKit/public/blink.gyp:blink',
131 '../v8/tools/gyp/v8.gyp:v8',
132 '../ui/gl/gl.gyp:gl', 131 '../ui/gl/gl.gyp:gl',
133 '../ui/shell_dialogs/shell_dialogs.gyp:shell_dialogs', 132 '../ui/shell_dialogs/shell_dialogs.gyp:shell_dialogs',
134 '../webkit/common/gpu/webkit_gpu.gyp:webkit_gpu', 133 '../webkit/common/gpu/webkit_gpu.gyp:webkit_gpu',
135 'android_webview_pak', 134 'android_webview_pak',
136 ], 135 ],
137 'include_dirs': [ 136 'include_dirs': [
138 '..', 137 '..',
139 '../skia/config', 138 '../skia/config',
140 '<(SHARED_INTERMEDIATE_DIR)/ui/resources/', 139 '<(SHARED_INTERMEDIATE_DIR)/ui/resources/',
141 ], 140 ],
(...skipping 101 matching lines...) Expand 10 before | Expand all | Expand 10 after
243 'common/render_view_messages.h', 242 'common/render_view_messages.h',
244 'common/url_constants.cc', 243 'common/url_constants.cc',
245 'common/url_constants.h', 244 'common/url_constants.h',
246 'lib/aw_browser_dependency_factory_impl.cc', 245 'lib/aw_browser_dependency_factory_impl.cc',
247 'lib/aw_browser_dependency_factory_impl.h', 246 'lib/aw_browser_dependency_factory_impl.h',
248 'lib/main/aw_main_delegate.cc', 247 'lib/main/aw_main_delegate.cc',
249 'lib/main/aw_main_delegate.h', 248 'lib/main/aw_main_delegate.h',
250 'public/browser/draw_gl.h', 249 'public/browser/draw_gl.h',
251 'renderer/aw_content_renderer_client.cc', 250 'renderer/aw_content_renderer_client.cc',
252 'renderer/aw_content_renderer_client.h', 251 'renderer/aw_content_renderer_client.h',
253 'renderer/aw_execution_termination_filter.cc',
254 'renderer/aw_execution_termination_filter.h',
255 'renderer/aw_key_systems.cc', 252 'renderer/aw_key_systems.cc',
256 'renderer/aw_key_systems.h', 253 'renderer/aw_key_systems.h',
257 'renderer/aw_permission_client.cc', 254 'renderer/aw_permission_client.cc',
258 'renderer/aw_permission_client.h', 255 'renderer/aw_permission_client.h',
259 'renderer/aw_render_process_observer.cc', 256 'renderer/aw_render_process_observer.cc',
260 'renderer/aw_render_process_observer.h', 257 'renderer/aw_render_process_observer.h',
261 'renderer/aw_render_frame_ext.cc', 258 'renderer/aw_render_frame_ext.cc',
262 'renderer/aw_render_frame_ext.h', 259 'renderer/aw_render_frame_ext.h',
263 'renderer/aw_render_view_ext.cc', 260 'renderer/aw_render_view_ext.cc',
264 'renderer/aw_render_view_ext.h', 261 'renderer/aw_render_view_ext.h',
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
324 '../ui/android/ui_android.gyp:ui_strings_grd', 321 '../ui/android/ui_android.gyp:ui_strings_grd',
325 'android_webview_jarjar_content_resources', 322 'android_webview_jarjar_content_resources',
326 'android_webview_jarjar_ui_resources', 323 'android_webview_jarjar_ui_resources',
327 'android_webview_strings_grd', 324 'android_webview_strings_grd',
328 ], 325 ],
329 }, 326 },
330 ], 327 ],
331 }], 328 }],
332 ], 329 ],
333 } 330 }
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