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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/chrome.gyp

Issue 39319: Snapshotting progress.... (Closed) Base URL: svn://chrome-svn.corp.google.com/chrome/trunk/src/
Patch Set: '' Created 11 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 | chrome/installer/util/util.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/chrome.gyp
===================================================================
--- chrome/chrome.gyp (revision 11284)
+++ chrome/chrome.gyp (working copy)
@@ -335,12 +335,10 @@
'../third_party/libxml/libxml.gyp:libxml',
'../third_party/npapi/npapi.gyp:npapi',
'third_party/hunspell/hunspell.gyp:hunspell',
+ '../webkit/webkit.gyp:glue',
],
'include_dirs': [
'..',
- # TODO(bradnelson): this should really be from a dependency on
- # webkit_resources.
- '<(SHARED_INTERMEDIATE_DIR)/webkit',
'<(INTERMEDIATE_DIR)',
],
'sources': [
@@ -358,6 +356,9 @@
'browser/autocomplete/autocomplete_accessibility.h',
'browser/autocomplete/autocomplete_edit.cc',
'browser/autocomplete/autocomplete_edit.h',
+ 'browser/autocomplete/autocomplete_edit_view.h',
+ 'browser/autocomplete/autocomplete_edit_view_win.cc',
+ 'browser/autocomplete/autocomplete_edit_view_win.h',
'browser/autocomplete/autocomplete_popup_model.cc',
'browser/autocomplete/autocomplete_popup_model.h',
'browser/autocomplete/autocomplete_popup_view.h',
@@ -515,11 +516,15 @@
'browser/debugger/debugger_wrapper.h',
'browser/debugger/dev_tools_window.cc',
'browser/debugger/dev_tools_window.h',
+ 'browser/debugger/dev_tools_view.cc',
+ 'browser/debugger/dev_tools_view.h',
'browser/dock_info.cc',
'browser/dock_info.h',
'browser/dom_operation_notification_details.h',
'browser/dom_ui/chrome_url_data_manager.cc',
'browser/dom_ui/chrome_url_data_manager.h',
+ 'browser/dom_ui/dev_tools_ui.cc',
+ 'browser/dom_ui/dev_tools_ui.h',
'browser/dom_ui/dom_ui.cc',
'browser/dom_ui/dom_ui.h',
'browser/dom_ui/dom_ui_contents.cc',
@@ -923,6 +928,8 @@
'browser/tab_contents/provisional_load_details.h',
'browser/tab_contents/render_view_context_menu.cc',
'browser/tab_contents/render_view_context_menu.h',
+ 'browser/tab_contents/render_view_context_menu_win.cc',
+ 'browser/tab_contents/render_view_context_menu_win.h',
'browser/tab_contents/render_view_host_manager.cc',
'browser/tab_contents/render_view_host_manager.h',
'browser/tab_contents/repost_form_warning.h',
@@ -1026,6 +1033,8 @@
'browser/views/frame/glass_browser_frame_view.h',
'browser/views/frame/opaque_browser_frame_view.cc',
'browser/views/frame/opaque_browser_frame_view.h',
+ 'browser/views/fullscreen_exit_bubble.cc',
+ 'browser/views/fullscreen_exit_bubble.h',
'browser/views/go_button.cc',
'browser/views/go_button.h',
'browser/views/html_dialog_view.cc',
@@ -1165,6 +1174,7 @@
'../net/net.gyp:net_resources',
'../google_update/google_update.gyp:google_update',
'installer/util/util.gyp:installer_util',
+ '../printing/printing.gyp:printing',
],
'sources': [
# Using built-in rule in vstudio for midl.
@@ -1220,6 +1230,10 @@
'browser/debugger/debugger_window.cc',
'browser/debugger/dev_tools_window.cc',
'browser/debugger/dev_tools_window.h',
+ 'browser/debugger/dev_tools_view.cc',
+ 'browser/debugger/dev_tools_view.h',
+ 'browser/dom_ui/dev_tools_ui.cc',
+ 'browser/dom_ui/dev_tools_ui.h',
'browser/dom_ui/html_dialog_contents.cc',
'browser/importer/ie_importer.cc',
'browser/tab_contents/render_view_context_menu_controller.cc',
@@ -1338,6 +1352,8 @@
'renderer/webmediaplayer_delegate_impl.h',
'renderer/webplugin_delegate_proxy.cc',
'renderer/webplugin_delegate_proxy.h',
+ 'renderer/webworker_proxy.cc',
+ 'renderer/webworker_proxy.h',
],
'link_settings': {
'mac_bundle_resources': [
@@ -1358,6 +1374,8 @@
'renderer/chrome_plugin_host.cc',
'renderer/plugin_channel_host.cc',
'renderer/webplugin_delegate_proxy.cc',
+ 'renderer/webworker_proxy.cc',
+ 'renderer/webworker_proxy.h',
],
},],
],
@@ -1445,6 +1463,8 @@
'dependencies': [
'views',
'../breakpad/breakpad.gyp:breakpad_handler',
+ '../sandbox/sandbox.gyp:sandbox',
+ 'worker',
],
},{ # 'OS!="win"
'variables': {
@@ -1574,9 +1594,39 @@
'renderer/mock_render_process.h',
'renderer/mock_render_thread.cc',
'renderer/mock_render_thread.h',
+ 'test/automation/automation_proxy.cc',
+ 'test/automation/automation_proxy.h',
+ 'test/automation/browser_proxy.cc',
+ 'test/automation/browser_proxy.h',
+ 'test/automation/tab_proxy.cc',
+ 'test/automation/tab_proxy.h',
+ 'test/automation/window_proxy.cc',
+ 'test/automation/window_proxy.h',
'test/testing_profile.cc',
'test/testing_profile.h',
+ 'test/ui/ui_test.cc',
+ 'test/ui/ui_test.h',
],
+ 'conditions': [
+ ['OS=="win"', {
+ 'include_dirs': [
+ 'third_party/wtl/include',
+ ],
+ },{ # 'OS!="win"
+ 'sources!': [
+ 'test/automation/automation_proxy.cc',
+ 'test/automation/automation_proxy.h',
+ 'test/automation/browser_proxy.cc',
+ 'test/automation/browser_proxy.h',
+ 'test/automation/tab_proxy.cc',
+ 'test/automation/tab_proxy.h',
+ 'test/automation/window_proxy.cc',
+ 'test/automation/window_proxy.h',
+ 'test/ui/ui_test.cc',
+ 'test/ui/ui_test.h',
+ ],
+ }],
+ ],
},
{
'target_name': 'ipc_tests',
@@ -1615,20 +1665,10 @@
],
'sources': [
'test/ui/run_all_unittests.cc',
- 'test/ui/ui_test.cc',
- 'test/ui/ui_test.h',
'test/ui/ui_test_suite.cc',
'test/ui/ui_test_suite.h',
- 'test/automation/automation_proxy.cc',
- 'test/automation/automation_proxy.h',
'test/automation/automation_handle_tracker.cc',
'test/automation/automation_handle_tracker.h',
- 'test/automation/browser_proxy.cc',
- 'test/automation/browser_proxy.h',
- 'test/automation/tab_proxy.cc',
- 'test/automation/tab_proxy.h',
- 'test/automation/window_proxy.cc',
- 'test/automation/window_proxy.h',
],
'conditions': [
['OS=="mac"', {
@@ -1689,12 +1729,17 @@
'browser/autocomplete/history_contents_provider_unittest.cc',
'browser/autocomplete/history_url_provider_unittest.cc',
'browser/autocomplete/keyword_provider_unittest.cc',
+ 'browser/back_forward_menu_model_unittest.cc',
'browser/bookmarks/bookmark_drag_data_unittest.cc',
'browser/bookmarks/bookmark_folder_tree_model_unittest.cc',
'browser/bookmarks/bookmark_html_writer_unittest.cc',
'browser/bookmarks/bookmark_model_unittest.cc',
'browser/bookmarks/bookmark_table_model_unittest.cc',
'browser/bookmarks/bookmark_utils_unittest.cc',
+ 'browser/browser_commands_unittest.cc',
+ 'browser/cache_manager_host_unittest.cc',
+ 'browser/chrome_thread_unittest.cc',
+ 'browser/command_updater_unittest.cc',
'browser/download/download_manager_unittest.cc',
'browser/download/download_request_manager_unittest.cc',
'browser/download/save_package_unittest.cc',
@@ -1702,6 +1747,7 @@
'browser/extensions/extension_ui_unittest.cc',
'browser/extensions/extensions_service_unittest.cc',
'browser/extensions/user_script_master_unittest.cc',
+ 'browser/google_url_tracker_unittest.cc',
'browser/history/expire_history_backend_unittest.cc',
'browser/history/history_backend_unittest.cc',
'browser/history/history_querying_unittest.cc',
@@ -1718,8 +1764,11 @@
'browser/history/visit_tracker_unittest.cc',
'browser/importer/firefox_importer_unittest.cc',
'browser/importer/importer_unittest.cc',
+ 'browser/login_prompt_unittest.cc',
'browser/metrics/metrics_log_unittest.cc',
'browser/metrics/metrics_response_unittest.cc',
+ 'browser/navigation_controller_unittest.cc',
+ 'browser/navigation_entry_unittest.cc',
'browser/net/dns_host_info_unittest.cc',
'browser/net/dns_master_unittest.cc',
'browser/net/resolve_proxy_msg_helper_unittest.cc',
@@ -1733,6 +1782,7 @@
'browser/printing/page_setup_unittest.cc',
'browser/printing/print_job_unittest.cc',
'browser/printing/win_printing_context_unittest.cc',
+ 'browser/profile_manager_unittest.cc',
'browser/renderer_host/audio_renderer_host_unittest.cc',
'browser/renderer_host/render_view_host_unittest.cc',
'browser/renderer_host/render_widget_host_unittest.cc',
@@ -1750,44 +1800,34 @@
'browser/search_engines/template_url_prepopulate_data_unittest.cc',
'browser/search_engines/template_url_unittest.cc',
'browser/sessions/session_backend_unittest.cc',
- 'browser/sessions/session_service_unittest.cc',
'browser/sessions/session_service_test_helper.cc',
'browser/sessions/session_service_test_helper.h',
+ 'browser/sessions/session_service_unittest.cc',
'browser/sessions/tab_restore_service_unittest.cc',
+ 'browser/site_instance_unittest.cc',
+ 'browser/spellcheck_unittest.cc',
'browser/tab_contents/web_contents_unittest.cc',
'browser/tabs/tab_strip_model_unittest.cc',
'browser/views/bookmark_editor_view_unittest.cc',
'browser/views/find_bar_win_unittest.cc',
'browser/views/keyword_editor_view_unittest.cc',
+ 'browser/visitedlink_unittest.cc',
'browser/webdata/web_database_unittest.cc',
- 'browser/back_forward_menu_model_unittest.cc',
- 'browser/browser_commands_unittest.cc',
- 'browser/cache_manager_host_unittest.cc',
- 'browser/chrome_thread_unittest.cc',
- 'browser/command_updater_unittest.cc',
- 'browser/google_url_tracker_unittest.cc',
- 'browser/login_prompt_unittest.cc',
- 'browser/navigation_controller_unittest.cc',
- 'browser/navigation_entry_unittest.cc',
- 'browser/profile_manager_unittest.cc',
- 'browser/site_instance_unittest.cc',
- 'browser/spellcheck_unittest.cc',
- 'browser/visitedlink_unittest.cc',
'browser/window_sizer_unittest.cc',
+ 'common/animation_unittest.cc',
+ 'common/bzip2_unittest.cc',
+ 'common/chrome_plugin_unittest.cc',
'common/extensions/url_pattern_unittest.cc',
'common/extensions/user_script_unittest.cc',
+ 'common/file_descriptor_set_unittest.cc',
'common/gfx/chrome_font_unittest.cc',
'common/gfx/emf_unittest.cc',
'common/gfx/icon_util_unittest.cc',
'common/gfx/text_elider_unittest.cc',
- 'common/net/url_util_unittest.cc',
- 'common/animation_unittest.cc',
- 'common/bzip2_unittest.cc',
- 'common/chrome_plugin_unittest.cc',
- 'common/file_descriptor_set_unittest.cc',
'common/json_value_serializer_unittest.cc',
'common/l10n_util_unittest.cc',
'common/mru_cache_unittest.cc',
+ 'common/net/url_util_unittest.cc',
'common/notification_service_unittest.cc',
'common/os_exchange_data_unittest.cc',
'common/pref_member_unittest.cc',
@@ -1806,13 +1846,19 @@
'renderer/render_view_unittest.cc',
'renderer/render_widget_unittest.cc',
'renderer/renderer_main_unittest.cc',
- 'test/v8_unit_test.cc',
- 'test/v8_unit_test.h',
'test/browser_with_test_window_test.cc',
'test/browser_with_test_window_test.h',
+ 'test/in_process_browser_test.cc',
+ 'test/in_process_browser_test.h',
'test/test_notification_tracker.cc',
'test/test_notification_tracker.h',
+ 'test/test_tab_contents.cc',
+ 'test/test_tab_contents.h',
+ 'test/ui_test_utils.cc',
+ 'test/ui_test_utils.h',
'test/unit/run_all_unittests.cc',
+ 'test/v8_unit_test.cc',
+ 'test/v8_unit_test.h',
],
'conditions': [
['OS=="win"', {
@@ -1842,11 +1888,13 @@
'browser/autocomplete/history_contents_provider_unittest.cc',
'browser/autocomplete/history_url_provider_unittest.cc',
'browser/autocomplete/keyword_provider_unittest.cc',
+ 'browser/back_forward_menu_model_unittest.cc',
'browser/bookmarks/bookmark_drag_data_unittest.cc',
'browser/bookmarks/bookmark_folder_tree_model_unittest.cc',
'browser/bookmarks/bookmark_html_writer_unittest.cc',
'browser/bookmarks/bookmark_table_model_unittest.cc',
'browser/bookmarks/bookmark_utils_unittest.cc',
+ 'browser/browser_commands_unittest.cc',
'browser/download/download_manager_unittest.cc',
'browser/download/download_request_manager_unittest.cc',
'browser/extensions/user_script_master_unittest.cc',
@@ -1854,6 +1902,8 @@
'browser/history/thumbnail_database_unittest.cc',
'browser/importer/firefox_importer_unittest.cc',
'browser/importer/importer_unittest.cc',
+ 'browser/login_prompt_unittest.cc',
+ 'browser/navigation_controller_unittest.cc',
'browser/net/resolve_proxy_msg_helper_unittest.cc',
'browser/net/url_fetcher_unittest.cc',
'browser/net/url_fixer_upper_unittest.cc',
@@ -1864,37 +1914,39 @@
'browser/printing/print_job_unittest.cc',
'browser/rlz/rlz_unittest.cc',
'browser/sessions/session_backend_unittest.cc',
- 'browser/sessions/session_service_unittest.cc',
'browser/sessions/session_service_test_helper.cc',
'browser/sessions/session_service_test_helper.h',
+ 'browser/sessions/session_service_unittest.cc',
'browser/sessions/tab_restore_service_unittest.cc',
'browser/tab_contents/web_contents_unittest.cc',
'browser/tabs/tab_strip_model_unittest.cc',
'browser/views/bookmark_editor_view_unittest.cc',
'browser/views/find_bar_win_unittest.cc',
'browser/views/keyword_editor_view_unittest.cc',
- 'browser/back_forward_menu_model_unittest.cc',
- 'browser/browser_commands_unittest.cc',
- 'browser/login_prompt_unittest.cc',
- 'browser/navigation_controller_unittest.cc',
'browser/visitedlink_unittest.cc',
'browser/webdata/web_database_unittest.cc',
'browser/window_sizer_unittest.cc',
+ 'common/chrome_plugin_unittest.cc',
'common/gfx/emf_unittest.cc',
'common/gfx/icon_util_unittest.cc',
'common/net/url_util_unittest.cc',
- 'common/chrome_plugin_unittest.cc',
'common/os_exchange_data_unittest.cc',
'common/pref_service_unittest.cc',
'common/time_format_unittest.cc',
'renderer/render_view_unittest.cc',
'renderer/render_widget_unittest.cc',
- 'test/v8_unit_test.cc',
- 'test/v8_unit_test.h',
'test/browser_with_test_window_test.cc',
'test/browser_with_test_window_test.h',
+ 'test/in_process_browser_test.cc',
+ 'test/in_process_browser_test.h',
'test/test_notification_tracker.cc',
'test/test_notification_tracker.h',
+ 'test/test_tab_contents.cc',
+ 'test/test_tab_contents.h',
+ 'test/ui_test_utils.cc',
+ 'test/ui_test_utils.h',
+ 'test/v8_unit_test.cc',
+ 'test/v8_unit_test.h',
],
}],
],
@@ -1940,14 +1992,8 @@
'../third_party/libxml/libxml.gyp:libxml',
'../third_party/npapi/npapi.gyp:npapi',
'third_party/hunspell/hunspell.gyp:hunspell',
+ '../webkit/webkit.gyp:glue',
],
- 'include_dirs': [
- '..',
- # TODO(bradnelson): this should really be from a dependency on
- # webkit_resources.
- '<(SHARED_INTERMEDIATE_DIR)/webkit',
- '<(INTERMEDIATE_DIR)',
- ],
'sources': [
# All .cc, .h, .m, and .mm files under browser except for tests and
# mocks.
@@ -2111,12 +2157,9 @@
'../third_party/libxml/libxml.gyp:libxml',
'../third_party/npapi/npapi.gyp:npapi',
'third_party/hunspell/hunspell.gyp:hunspell',
+ '../webkit/webkit.gyp:glue',
],
'include_dirs': [
- '..',
- # TODO(bradnelson): this should really be from a dependency on
- # webkit_resources.
- '<(SHARED_INTERMEDIATE_DIR)/webkit',
'<(INTERMEDIATE_DIR)',
],
'sources': [
@@ -2159,6 +2202,37 @@
},],
],
},
+ {
+ 'target_name': 'worker',
+ 'type': 'static_library',
+ 'dependencies': [
+ '../base/base.gyp:base',
+ '../webkit/webkit.gyp:webkit',
+ ],
+ 'sources': [
+ 'tools/build/win/precompiled.cc',
+ 'tools/build/win/precompiled.h',
+
+ 'worker/webworkerclient_proxy.cc',
+ 'worker/webworkerclient_proxy.h',
+ 'worker/worker_main.cc',
+ 'worker/worker_process.cc',
+ 'worker/worker_process.h',
+ 'worker/worker_thread.cc',
+ 'worker/worker_thread.h',
+ 'worker/worker_webkitclient_impl.cc',
+ 'worker/worker_webkitclient_impl.h',
+ ],
+ 'include_dirs': [
+ '..',
+ ],
+ 'configurations': {
+ 'Debug': {
+ 'msvs_precompiled_header': 'tools/build/win/precompiled.h',
+ 'msvs_precompiled_source': 'tools/build/win/precompiled.cc',
+ },
+ },
+ },
]}, # 'targets'
], # OS=="mac"
], # 'conditions'
« no previous file with comments | « no previous file | chrome/installer/util/util.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698