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

Unified Diff: webkit/tools/test_shell/SConscript

Issue 8670: Switch to using the message loop rather than gtk_main(). (Closed)
Patch Set: Addressing comments Created 12 years, 2 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 | « webkit/glue/webkit_glue.cc ('k') | webkit/tools/test_shell/gtk/test_shell.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webkit/tools/test_shell/SConscript
diff --git a/webkit/tools/test_shell/SConscript b/webkit/tools/test_shell/SConscript
index 70c9260e762e279e22c5034bbf809dc4b3efb237..92e9d0dd74dc79606dfcd008d9355e5bd6103eea 100644
--- a/webkit/tools/test_shell/SConscript
+++ b/webkit/tools/test_shell/SConscript
@@ -93,6 +93,7 @@ elif env['PLATFORM'] in ('posix', 'darwin'):
)
input_files = [
+ 'layout_test_controller.cc',
'simple_resource_loader_bridge.cc',
'test_navigation_controller.cc',
'test_shell_request_context.cc',
@@ -104,7 +105,6 @@ if env['PLATFORM'] == 'win32':
'drag_delegate.cc',
'drop_delegate.cc',
'event_sending_controller.cc',
- 'layout_test_controller.cc',
'test_shell.cc',
'test_shell_win.cc',
'test_webview_delegate.cc',
@@ -117,6 +117,7 @@ elif env['PLATFORM'] == 'posix':
'gtk/test_shell.cc',
'gtk/webwidget_host.cc',
'gtk/webview_host.cc',
+ 'gtk/test_webview_delegate.cc',
])
lib = env.ChromeStaticLibrary('test_shell', input_files)
@@ -153,6 +154,7 @@ if env['PLATFORM'] == 'win32':
test_files = [
'image_decoder_unittest.cc',
'run_all_tests.cc',
+ 'layout_test_controller_unittest.cc',
'$WEBKIT_DIR/glue/autocomplete_input_listener_unittest.cc',
'$WEBKIT_DIR/glue/cpp_variant_unittest.cc',
'$WEBKIT_DIR/glue/glue_serialize_unittest.cc',
@@ -167,7 +169,6 @@ if env['PLATFORM'] == 'win32':
# TODO(port): put portable files in above test_files declaration.
test_files.extend([
'keyboard_unittest.cc',
- 'layout_test_controller_unittest.cc',
'node_leak_test.cc',
'plugin_tests.cc',
'run_all_tests.cc',
« no previous file with comments | « webkit/glue/webkit_glue.cc ('k') | webkit/tools/test_shell/gtk/test_shell.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698