diff options
| -rw-r--r-- | chrome/chrome.gyp | 796 | ||||
| -rw-r--r-- | chrome/installer/util/prebuild/util_prebuild.gyp | 34 | ||||
| -rw-r--r-- | chrome/installer/util/util.gyp | 83 | ||||
| -rw-r--r-- | google_update/google_update.gyp | 26 |
4 files changed, 720 insertions, 219 deletions
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp index 43ff07a..b1b9a46 100644 --- a/chrome/chrome.gyp +++ b/chrome/chrome.gyp @@ -83,6 +83,7 @@ '../third_party/icu38/icu38.gyp:icui18n', '../third_party/icu38/icu38.gyp:icuuc', '../third_party/libxml/libxml.gyp:libxml', + '../third_party/zlib/zlib.gyp:zlib', '../third_party/npapi/npapi.gyp:npapi', '../webkit/webkit.gyp:glue', ], @@ -273,7 +274,7 @@ 'common/transport_dib_linux.cc', 'common/transport_dib_mac.cc', 'common/transport_dib_win.cc', - 'common/unzip.cc', + 'common/unzip.cc', # Requires zlib directly. 'common/unzip.h', 'common/url_constants.cc', 'common/url_constants.h', @@ -295,6 +296,15 @@ ], }, 'conditions': [ + ['OS=="win"', { + 'include_dirs': [ + 'third_party/wtl/include', + ], + 'sources!': [ + 'common/temp_scaffolding_stubs.cc', + 'common/temp_scaffolding_stubs.h', + ], + },], ['OS!="win"', { 'sources!': [ 'common/gfx/emf.cc', @@ -324,10 +334,20 @@ ], '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. + 'browser/alternate_nav_url_fetcher.cc', + 'browser/alternate_nav_url_fetcher.h', + 'browser/app_controller_mac.h', + 'browser/app_controller_mac.mm', + 'browser/app_modal_dialog_queue.cc', + 'browser/app_modal_dialog_queue.h', 'browser/autocomplete/autocomplete.cc', 'browser/autocomplete/autocomplete.h', 'browser/autocomplete/autocomplete_accessibility.cc', @@ -349,6 +369,8 @@ 'browser/autocomplete/keyword_provider.h', 'browser/autocomplete/search_provider.cc', 'browser/autocomplete/search_provider.h', + 'browser/autofill_manager.cc', + 'browser/autofill_manager.h', 'browser/automation/automation_autocomplete_edit_tracker.h', 'browser/automation/automation_browser_tracker.h', 'browser/automation/automation_constrained_window_tracker.h', @@ -364,10 +386,14 @@ 'browser/automation/ui_controls.h', 'browser/automation/url_request_failed_dns_job.cc', 'browser/automation/url_request_failed_dns_job.h', - 'browser/automation/url_request_slow_download_job.cc', - 'browser/automation/url_request_slow_download_job.h', 'browser/automation/url_request_mock_http_job.cc', 'browser/automation/url_request_mock_http_job.h', + 'browser/automation/url_request_slow_download_job.cc', + 'browser/automation/url_request_slow_download_job.h', + 'browser/back_forward_menu_model.cc', + 'browser/back_forward_menu_model.h', + 'browser/back_forward_menu_model_win.cc', + 'browser/back_forward_menu_model_win.h', 'browser/bookmarks/bookmark_codec.cc', 'browser/bookmarks/bookmark_codec.h', 'browser/bookmarks/bookmark_context_menu.cc', @@ -389,6 +415,55 @@ 'browser/bookmarks/bookmark_table_model.h', 'browser/bookmarks/bookmark_utils.cc', 'browser/bookmarks/bookmark_utils.h', + 'browser/browser.cc', + 'browser/browser.h', + 'browser/browser_about_handler.cc', + 'browser/browser_about_handler.h', + 'browser/browser_accessibility.cc', + 'browser/browser_accessibility.h', + 'browser/browser_accessibility_manager.cc', + 'browser/browser_accessibility_manager.h', + 'browser/browser_init.cc', + 'browser/browser_init.h', + 'browser/browser_list.cc', + 'browser/browser_list.h', + 'browser/browser_main.cc', + 'browser/browser_main_gtk.cc', + 'browser/browser_main_mac.mm', + 'browser/browser_main_win.cc', + 'browser/browser_main_win.h', + 'browser/browser_prefs.cc', + 'browser/browser_prefs.h', + 'browser/browser_process.cc', + 'browser/browser_process.h', + 'browser/browser_process_impl.cc', + 'browser/browser_process_impl.h', + 'browser/browser_shutdown.cc', + 'browser/browser_shutdown.h', + 'browser/browser_trial.cc', + 'browser/browser_trial.h', + 'browser/browser_url_handler.cc', + 'browser/browser_url_handler.h', + 'browser/browser_window.h', + 'browser/browser_window_factory.mm', + 'browser/browsing_data_remover.cc', + 'browser/browsing_data_remover.h', + 'browser/browsing_instance.cc', + 'browser/browsing_instance.h', + 'browser/cache_manager_host.cc', + 'browser/cache_manager_host.h', + 'browser/cancelable_request.cc', + 'browser/cancelable_request.h', + 'browser/cert_store.cc', + 'browser/cert_store.h', + 'browser/character_encoding.cc', + 'browser/character_encoding.h', + 'browser/chrome_plugin_browsing_context.cc', + 'browser/chrome_plugin_browsing_context.h', + 'browser/chrome_plugin_host.cc', + 'browser/chrome_plugin_host.h', + 'browser/chrome_thread.cc', + 'browser/chrome_thread.h', 'browser/cocoa/base_view.h', 'browser/cocoa/base_view.mm', 'browser/cocoa/browser_window_cocoa.h', @@ -412,6 +487,10 @@ 'browser/cocoa/toolbar_button_cell.mm', 'browser/cocoa/toolbar_view.h', 'browser/cocoa/toolbar_view.mm', + 'browser/command_updater.cc', + 'browser/command_updater.h', + 'browser/cross_site_request_manager.cc', + 'browser/cross_site_request_manager.h', 'browser/debugger/debugger_contents.cc', 'browser/debugger/debugger_contents.h', 'browser/debugger/debugger_host.h', @@ -430,6 +509,11 @@ 'browser/debugger/debugger_window.h', 'browser/debugger/debugger_wrapper.cc', 'browser/debugger/debugger_wrapper.h', + 'browser/debugger/dev_tools_window.cc', + 'browser/debugger/dev_tools_window.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/dom_ui.cc', @@ -475,20 +559,41 @@ 'browser/download/save_page_model.cc', 'browser/download/save_page_model.h', 'browser/download/save_types.h', + 'browser/drag_utils.cc', + 'browser/drag_utils.h', + 'browser/encoding_menu_controller_delegate.cc', + 'browser/encoding_menu_controller_delegate.h', 'browser/extensions/extension.cc', 'browser/extensions/extension.h', 'browser/extensions/extension_error_reporter.cc', 'browser/extensions/extension_error_reporter.h', - 'browser/extensions/extension_view.cc', - 'browser/extensions/extension_view.h', 'browser/extensions/extension_protocols.cc', 'browser/extensions/extension_protocols.h', + 'browser/extensions/extension_view.cc', + 'browser/extensions/extension_view.h', 'browser/extensions/extensions_service.cc', 'browser/extensions/extensions_service.h', 'browser/extensions/extensions_ui.cc', 'browser/extensions/extensions_ui.h', 'browser/extensions/user_script_master.cc', 'browser/extensions/user_script_master.h', + 'browser/external_protocol_handler.cc', + 'browser/external_protocol_handler.h', + 'browser/external_tab_container.cc', + 'browser/external_tab_container.h', + 'browser/fav_icon_helper.cc', + 'browser/fav_icon_helper.h', + 'browser/find_notification_details.h', + 'browser/first_run.cc', + 'browser/first_run.h', + 'browser/gears_integration.cc', + 'browser/gears_integration.h', + 'browser/google_update.cc', + 'browser/google_update.h', + 'browser/google_url_tracker.cc', + 'browser/google_url_tracker.h', + 'browser/google_util.cc', + 'browser/google_util.h', 'browser/gtk/back_forward_menu_model_gtk.cc', 'browser/gtk/back_forward_menu_model_gtk.h', 'browser/gtk/browser_toolbar_view_gtk.cc', @@ -559,6 +664,12 @@ 'browser/history/visit_tracker.h', 'browser/history/visitsegment_database.cc', 'browser/history/visitsegment_database.h', + 'browser/icon_loader.cc', + 'browser/icon_loader.h', + 'browser/icon_manager.cc', + 'browser/icon_manager.h', + 'browser/ime_input.cc', + 'browser/ime_input.h', 'browser/importer/firefox2_importer.cc', 'browser/importer/firefox2_importer.h', 'browser/importer/firefox3_importer.cc', @@ -575,6 +686,23 @@ 'browser/importer/importer.h', 'browser/importer/mork_reader.cc', 'browser/importer/mork_reader.h', + 'browser/jankometer.cc', + 'browser/jankometer.h', + 'browser/js_before_unload_handler.h', + 'browser/js_before_unload_handler_win.cc', + 'browser/js_before_unload_handler_win.h', + 'browser/jsmessage_box_handler.h', + 'browser/jsmessage_box_handler_win.cc', + 'browser/jsmessage_box_handler_win.h', + 'browser/load_from_memory_cache_details.h', + 'browser/load_notification_details.h', + 'browser/location_bar.h', + 'browser/login_prompt.cc', + 'browser/login_prompt.h', + 'browser/memory_details.cc', + 'browser/memory_details.h', + 'browser/meta_table_helper.cc', + 'browser/meta_table_helper.h', 'browser/metrics/metrics_log.cc', 'browser/metrics/metrics_log.h', 'browser/metrics/metrics_response.cc', @@ -583,6 +711,8 @@ 'browser/metrics/metrics_service.h', 'browser/metrics/user_metrics.cc', 'browser/metrics/user_metrics.h', + 'browser/modal_html_dialog_delegate.cc', + 'browser/modal_html_dialog_delegate.h', 'browser/net/chrome_url_request_context.cc', 'browser/net/chrome_url_request_context.h', 'browser/net/dns_global.cc', @@ -603,6 +733,9 @@ 'browser/net/url_fetcher_protect.h', 'browser/net/url_fixer_upper.cc', 'browser/net/url_fixer_upper.h', + 'browser/options_window.h', + 'browser/page_state.cc', + 'browser/page_state.h', 'browser/password_manager/encryptor.cc', 'browser/password_manager/encryptor.h', 'browser/password_manager/ie7_password.cc', @@ -612,6 +745,12 @@ 'browser/password_manager/password_form_manager_win.cc', 'browser/password_manager/password_manager.cc', 'browser/password_manager/password_manager.h', + 'browser/plugin_installer.cc', + 'browser/plugin_installer.h', + 'browser/plugin_process_host.cc', + 'browser/plugin_process_host.h', + 'browser/plugin_service.cc', + 'browser/plugin_service.h', 'browser/printing/page_number.cc', 'browser/printing/page_number.h', 'browser/printing/page_overlays.cc', @@ -640,6 +779,13 @@ 'browser/printing/printer_query.h', 'browser/printing/win_printing_context.cc', 'browser/printing/win_printing_context.h', + 'browser/process_singleton.h', + 'browser/process_singleton_linux.cc', + 'browser/process_singleton_win.cc', + 'browser/profile.cc', + 'browser/profile.h', + 'browser/profile_manager.cc', + 'browser/profile_manager.h', 'browser/renderer_host/async_resource_handler.cc', 'browser/renderer_host/async_resource_handler.h', 'browser/renderer_host/audio_renderer_host.cc', @@ -711,6 +857,8 @@ 'browser/safe_browsing/safe_browsing_service.h', 'browser/safe_browsing/safe_browsing_util.cc', 'browser/safe_browsing/safe_browsing_util.h', + 'browser/sandbox_policy.cc', + 'browser/sandbox_policy.h', 'browser/search_engines/template_url.cc', 'browser/search_engines/template_url.h', 'browser/search_engines/template_url_fetcher.cc', @@ -721,6 +869,8 @@ 'browser/search_engines/template_url_parser.h', 'browser/search_engines/template_url_prepopulate_data.cc', 'browser/search_engines/template_url_prepopulate_data.h', + 'browser/session_startup_pref.cc', + 'browser/session_startup_pref.h', 'browser/sessions/base_session_service.cc', 'browser/sessions/base_session_service.h', 'browser/sessions/session_backend.cc', @@ -737,6 +887,13 @@ 'browser/sessions/session_types.h', 'browser/sessions/tab_restore_service.cc', 'browser/sessions/tab_restore_service.h', + 'browser/shell_dialogs.h', + 'browser/shell_integration.cc', + 'browser/shell_integration.h', + 'browser/spellcheck_worditerator.cc', + 'browser/spellcheck_worditerator.h', + 'browser/spellchecker.cc', + 'browser/spellchecker.h', 'browser/ssl/ssl_blocking_page.cc', 'browser/ssl/ssl_blocking_page.h', 'browser/ssl/ssl_error_info.cc', @@ -747,6 +904,7 @@ 'browser/ssl/ssl_manager.h', 'browser/ssl/ssl_policy.cc', 'browser/ssl/ssl_policy.h', + 'browser/status_bubble.h', 'browser/tab_contents/constrained_window.h', 'browser/tab_contents/infobar_delegate.cc', 'browser/tab_contents/infobar_delegate.h', @@ -795,57 +953,15 @@ 'browser/tabs/tab_strip_model.h', 'browser/tabs/tab_strip_model_order_controller.cc', 'browser/tabs/tab_strip_model_order_controller.h', - 'browser/views/frame/aero_glass_frame.cc', - 'browser/views/frame/aero_glass_frame.h', - 'browser/views/frame/aero_glass_non_client_view.cc', - 'browser/views/frame/aero_glass_non_client_view.h', - 'browser/views/frame/browser_frame.h', - 'browser/views/frame/browser_view.cc', - 'browser/views/frame/browser_view.h', - 'browser/views/frame/browser_window_factory.cc', - 'browser/views/frame/opaque_frame.cc', - 'browser/views/frame/opaque_frame.h', - 'browser/views/frame/opaque_non_client_view.cc', - 'browser/views/frame/opaque_non_client_view.h', - 'browser/views/infobars/infobar_container.cc', - 'browser/views/infobars/infobar_container.h', - 'browser/views/infobars/infobars.cc', - 'browser/views/infobars/infobars.h', - 'browser/views/options/advanced_contents_view.cc', - 'browser/views/options/advanced_contents_view.h', - 'browser/views/options/advanced_page_view.cc', - 'browser/views/options/advanced_page_view.h', - 'browser/views/options/content_page_view.cc', - 'browser/views/options/content_page_view.h', - 'browser/views/options/cookies_view.cc', - 'browser/views/options/cookies_view.h', - 'browser/views/options/fonts_languages_window_view.cc', - 'browser/views/options/fonts_languages_window_view.h', - 'browser/views/options/fonts_page_view.cc', - 'browser/views/options/fonts_page_view.h', - 'browser/views/options/general_page_view.cc', - 'browser/views/options/general_page_view.h', - 'browser/views/options/language_combobox_model.cc', - 'browser/views/options/language_combobox_model.h', - 'browser/views/options/languages_page_view.cc', - 'browser/views/options/languages_page_view.h', - 'browser/views/options/options_group_view.cc', - 'browser/views/options/options_group_view.h', - 'browser/views/options/options_page_view.cc', - 'browser/views/options/options_page_view.h', - 'browser/views/options/options_window_view.cc', - 'browser/views/tabs/dragged_tab_controller.cc', - 'browser/views/tabs/dragged_tab_controller.h', - 'browser/views/tabs/dragged_tab_view.cc', - 'browser/views/tabs/dragged_tab_view.h', - 'browser/views/tabs/hwnd_photobooth.cc', - 'browser/views/tabs/hwnd_photobooth.h', - 'browser/views/tabs/tab.cc', - 'browser/views/tabs/tab.h', - 'browser/views/tabs/tab_renderer.cc', - 'browser/views/tabs/tab_renderer.h', - 'browser/views/tabs/tab_strip.cc', - 'browser/views/tabs/tab_strip.h', + 'browser/task_manager.cc', + 'browser/task_manager.h', + 'browser/task_manager_resource_providers.cc', + 'browser/task_manager_resource_providers.h', + 'browser/toolbar_model.cc', + 'browser/toolbar_model.h', + 'browser/user_data_manager.cc', + 'browser/user_data_manager.h', + 'browser/view_ids.h', 'browser/views/about_chrome_view.cc', 'browser/views/about_chrome_view.h', 'browser/views/about_ipc_dialog.cc', @@ -900,6 +1016,14 @@ 'browser/views/first_run_view.h', 'browser/views/first_run_view_base.cc', 'browser/views/first_run_view_base.h', + 'browser/views/frame/browser_frame.cc', + 'browser/views/frame/browser_frame.h', + 'browser/views/frame/browser_view.cc', + 'browser/views/frame/browser_view.h', + 'browser/views/frame/glass_browser_frame_view.cc', + '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/go_button.cc', 'browser/views/go_button.h', 'browser/views/html_dialog_view.cc', @@ -916,6 +1040,10 @@ 'browser/views/importing_progress_view.h', 'browser/views/info_bubble.cc', 'browser/views/info_bubble.h', + 'browser/views/infobars/infobar_container.cc', + 'browser/views/infobars/infobar_container.h', + 'browser/views/infobars/infobars.cc', + 'browser/views/infobars/infobars.h', 'browser/views/input_window.cc', 'browser/views/input_window.h', 'browser/views/keyword_editor_view.cc', @@ -926,6 +1054,29 @@ 'browser/views/login_view.h', 'browser/views/new_profile_dialog.cc', 'browser/views/new_profile_dialog.h', + 'browser/views/options/advanced_contents_view.cc', + 'browser/views/options/advanced_contents_view.h', + 'browser/views/options/advanced_page_view.cc', + 'browser/views/options/advanced_page_view.h', + 'browser/views/options/content_page_view.cc', + 'browser/views/options/content_page_view.h', + 'browser/views/options/cookies_view.cc', + 'browser/views/options/cookies_view.h', + 'browser/views/options/fonts_languages_window_view.cc', + 'browser/views/options/fonts_languages_window_view.h', + 'browser/views/options/fonts_page_view.cc', + 'browser/views/options/fonts_page_view.h', + 'browser/views/options/general_page_view.cc', + 'browser/views/options/general_page_view.h', + 'browser/views/options/language_combobox_model.cc', + 'browser/views/options/language_combobox_model.h', + 'browser/views/options/languages_page_view.cc', + 'browser/views/options/languages_page_view.h', + 'browser/views/options/options_group_view.cc', + 'browser/views/options/options_group_view.h', + 'browser/views/options/options_page_view.cc', + 'browser/views/options/options_page_view.h', + 'browser/views/options/options_window_view.cc', 'browser/views/page_info_window.cc', 'browser/views/page_info_window.h', 'browser/views/password_manager_exceptions_view.cc', @@ -952,6 +1103,18 @@ 'browser/views/tab_contents_container_view.h', 'browser/views/tab_icon_view.cc', 'browser/views/tab_icon_view.h', + 'browser/views/tabs/dragged_tab_controller.cc', + 'browser/views/tabs/dragged_tab_controller.h', + 'browser/views/tabs/dragged_tab_view.cc', + 'browser/views/tabs/dragged_tab_view.h', + 'browser/views/tabs/hwnd_photobooth.cc', + 'browser/views/tabs/hwnd_photobooth.h', + 'browser/views/tabs/tab.cc', + 'browser/views/tabs/tab.h', + 'browser/views/tabs/tab_renderer.cc', + 'browser/views/tabs/tab_renderer.h', + 'browser/views/tabs/tab_strip.cc', + 'browser/views/tabs/tab_strip.h', 'browser/views/theme_helpers.cc', 'browser/views/theme_helpers.h', 'browser/views/toolbar_star_toggle.cc', @@ -960,174 +1123,48 @@ 'browser/views/toolbar_view.h', 'browser/views/user_data_dir_dialog.cc', 'browser/views/user_data_dir_dialog.h', + 'browser/visitedlink_master.cc', + 'browser/visitedlink_master.h', 'browser/webdata/web_data_service.cc', 'browser/webdata/web_data_service.h', 'browser/webdata/web_data_service_win.cc', 'browser/webdata/web_database.cc', 'browser/webdata/web_database.h', 'browser/webdata/web_database_win.cc', + 'browser/window_sizer.cc', + 'browser/window_sizer.h', 'browser/worker_host/worker_process_host.cc', 'browser/worker_host/worker_process_host.h', 'browser/worker_host/worker_service.cc', 'browser/worker_host/worker_service.h', - 'browser/alternate_nav_url_fetcher.cc', - 'browser/alternate_nav_url_fetcher.h', - 'browser/app_controller_mac.h', - 'browser/app_controller_mac.mm', - 'browser/app_modal_dialog_queue.cc', - 'browser/app_modal_dialog_queue.h', - 'browser/autofill_manager.cc', - 'browser/autofill_manager.h', - 'browser/back_forward_menu_model.cc', - 'browser/back_forward_menu_model.h', - 'browser/back_forward_menu_model_win.cc', - 'browser/back_forward_menu_model_win.h', - 'browser/browser.cc', - 'browser/browser.h', - 'browser/browser_about_handler.cc', - 'browser/browser_about_handler.h', - 'browser/browser_accessibility.cc', - 'browser/browser_accessibility.h', - 'browser/browser_accessibility_manager.cc', - 'browser/browser_accessibility_manager.h', - 'browser/browser_init.cc', - 'browser/browser_init.h', - 'browser/browser_list.cc', - 'browser/browser_list.h', - 'browser/browser_main.cc', - 'browser/browser_main_gtk.cc', - 'browser/browser_main_mac.mm', - 'browser/browser_main_win.cc', - 'browser/browser_main_win.h', - 'browser/browser_prefs.cc', - 'browser/browser_prefs.h', - 'browser/browser_process.cc', - 'browser/browser_process.h', - 'browser/browser_process_impl.cc', - 'browser/browser_process_impl.h', - 'browser/browser_shutdown.cc', - 'browser/browser_shutdown.h', - 'browser/browser_trial.cc', - 'browser/browser_trial.h', - 'browser/browser_url_handler.cc', - 'browser/browser_url_handler.h', - 'browser/browser_window.h', - 'browser/browser_window_factory.mm', - 'browser/browsing_data_remover.cc', - 'browser/browsing_data_remover.h', - 'browser/browsing_instance.cc', - 'browser/browsing_instance.h', - 'browser/cache_manager_host.cc', - 'browser/cache_manager_host.h', - 'browser/cancelable_request.cc', - 'browser/cancelable_request.h', - 'browser/cert_store.cc', - 'browser/cert_store.h', - 'browser/character_encoding.cc', - 'browser/character_encoding.h', - 'browser/chrome_plugin_browsing_context.cc', - 'browser/chrome_plugin_browsing_context.h', - 'browser/chrome_plugin_host.cc', - 'browser/chrome_plugin_host.h', - 'browser/chrome_thread.cc', - 'browser/chrome_thread.h', - 'browser/command_updater.cc', - 'browser/command_updater.h', - 'browser/cross_site_request_manager.cc', - 'browser/cross_site_request_manager.h', - 'browser/dock_info.cc', - 'browser/dock_info.h', - 'browser/dom_operation_notification_details.h', - 'browser/drag_utils.cc', - 'browser/drag_utils.h', - 'browser/encoding_menu_controller_delegate.cc', - 'browser/encoding_menu_controller_delegate.h', - 'browser/external_protocol_handler.cc', - 'browser/external_protocol_handler.h', - 'browser/external_tab_container.cc', - 'browser/external_tab_container.h', - 'browser/fav_icon_helper.cc', - 'browser/fav_icon_helper.h', - 'browser/find_notification_details.h', - 'browser/first_run.cc', - 'browser/first_run.h', - 'browser/gears_integration.cc', - 'browser/gears_integration.h', - 'browser/google_update.cc', - 'browser/google_update.h', - 'browser/google_url_tracker.cc', - 'browser/google_url_tracker.h', - 'browser/google_util.cc', - 'browser/google_util.h', - 'browser/icon_loader.cc', - 'browser/icon_loader.h', - 'browser/icon_manager.cc', - 'browser/icon_manager.h', - 'browser/ime_input.cc', - 'browser/ime_input.h', - 'browser/jankometer.cc', - 'browser/jankometer.h', - 'browser/js_before_unload_handler.h', - 'browser/js_before_unload_handler_win.cc', - 'browser/js_before_unload_handler_win.h', - 'browser/jsmessage_box_handler.h', - 'browser/jsmessage_box_handler_win.cc', - 'browser/jsmessage_box_handler_win.h', - 'browser/load_from_memory_cache_details.h', - 'browser/load_notification_details.h', - 'browser/location_bar.h', - 'browser/login_prompt.cc', - 'browser/login_prompt.h', - 'browser/memory_details.cc', - 'browser/memory_details.h', - 'browser/meta_table_helper.cc', - 'browser/meta_table_helper.h', - 'browser/modal_html_dialog_delegate.cc', - 'browser/modal_html_dialog_delegate.h', - 'browser/options_window.h', - 'browser/page_state.cc', - 'browser/page_state.h', - 'browser/plugin_installer.cc', - 'browser/plugin_installer.h', - 'browser/plugin_process_host.cc', - 'browser/plugin_process_host.h', - 'browser/plugin_service.cc', - 'browser/plugin_service.h', - 'browser/process_singleton.h', - 'browser/process_singleton_linux.cc', - 'browser/process_singleton_win.cc', - 'browser/profile.cc', - 'browser/profile.h', - 'browser/profile_manager.cc', - 'browser/profile_manager.h', - 'browser/sandbox_policy.cc', - 'browser/sandbox_policy.h', - 'browser/session_startup_pref.cc', - 'browser/session_startup_pref.h', - 'browser/shell_dialogs.h', - 'browser/shell_integration.cc', - 'browser/shell_integration.h', - 'browser/spellcheck_worditerator.cc', - 'browser/spellcheck_worditerator.h', - 'browser/spellchecker.cc', - 'browser/spellchecker.h', - 'browser/status_bubble.h', - 'browser/task_manager.cc', - 'browser/task_manager.h', - 'browser/task_manager_resource_providers.cc', - 'browser/task_manager_resource_providers.h', - 'browser/toolbar_model.cc', - 'browser/toolbar_model.h', - 'browser/user_data_manager.cc', - 'browser/user_data_manager.h', - 'browser/view_ids.h', - 'browser/visitedlink_master.cc', - 'browser/visitedlink_master.h', - 'browser/window_sizer.cc', - 'browser/window_sizer.h', ], 'conditions': [ - ['OS!="win"', { + ['OS=="win"', { + 'defines': [ + '__STD_C', + '_CRT_SECURE_NO_DEPRECATE', + '_SCL_SECURE_NO_DEPRECATE', + ], + 'include_dirs': [ + 'third_party/wtl/include', + ], + 'dependencies': [ + '../net/net.gyp:net_resources', + '../google_update/google_update.gyp:google_update', + 'installer/util/util.gyp:installer_util', + ], + 'sources': [ + # Using built-in rule in vstudio for midl. + 'browser/history/history_indexer.idl', + ], + 'sources!': [ + 'browser/autocomplete/edit_drop_target.cc', + 'browser/autocomplete/edit_drop_target.h', + 'browser/download/save_page_model.cc', + 'browser/download/save_page_model.h', + 'browser/history/history_publisher_none.cc', + ], + }, { # 'OS!="win" 'sources/': [ # Exclude most of automation. ['exclude', '^browser/automation/'], @@ -1160,14 +1197,19 @@ ['exclude', '^browser/views/'], ], 'sources!': [ + 'browser/app_modal_dialog_queue.cc', 'browser/autocomplete/autocomplete_accessibility.cc', 'browser/autocomplete/autocomplete_edit.cc', 'browser/autocomplete/autocomplete_popup_model.cc', 'browser/autocomplete/edit_drop_target.cc', 'browser/bookmarks/bookmark_context_menu.cc', 'browser/bookmarks/bookmark_drop_info.cc', + 'browser/browser_accessibility.cc', + 'browser/browser_accessibility_manager.cc', 'browser/debugger/debugger_view.cc', 'browser/debugger/debugger_window.cc', + 'browser/debugger/dev_tools_window.cc', + 'browser/debugger/dev_tools_window.h', 'browser/dom_ui/html_dialog_contents.cc', 'browser/importer/ie_importer.cc', 'browser/tab_contents/render_view_context_menu_controller.cc', @@ -1183,15 +1225,22 @@ 'browser/external_tab_container.cc', 'browser/first_run.cc', 'browser/google_update.cc', + 'browser/history/history_indexer.idl', + 'browser/history_tab_ui.cc', + 'browser/history_view.cc', 'browser/icon_loader.cc', 'browser/icon_manager.cc', 'browser/ime_input.cc', + 'browser/importer/ie_importer.cc', 'browser/jankometer.cc', 'browser/login_prompt.cc', 'browser/memory_details.cc', 'browser/modal_html_dialog_delegate.cc', 'browser/sandbox_policy.cc', 'browser/shell_integration.cc', + 'browser/tab_contents/render_view_context_menu_controller.cc', + 'browser/tab_contents/web_drag_source.cc', + 'browser/tab_contents/web_drop_target.cc', 'browser/task_manager.cc', 'browser/task_manager_resource_providers.cc', 'browser/window_sizer.cc', @@ -1286,13 +1335,21 @@ ], }, 'conditions': [ + ['OS=="win"', { + 'include_dirs': [ + 'third_party/wtl/include', + ], + 'dependencies': [ + 'plugin', + ], + },], ['OS!="win"', { 'sources!': [ 'renderer/chrome_plugin_host.cc', 'renderer/plugin_channel_host.cc', 'renderer/webplugin_delegate_proxy.cc', ], - }], + },], ], }, { @@ -1350,8 +1407,8 @@ ['OS=="mac"', { # 'branding' is a variable defined in common.gypi # (e.g. "Chromium", "Chrome") - 'product_name': '<(branding)', - 'conditions': [ + 'product_name': '<(branding)', + 'conditions': [ ['branding=="Chrome"', { 'mac_bundle_resources': ['app/theme/google_chrome/app.icns'], }, { # else: branding!="Chrome" @@ -1371,7 +1428,15 @@ }], ], }], - ['OS!="win"', { + ['OS=="win"', { + 'include_dirs': [ + 'third_party/wtl/include', + ], + 'dependencies': [ + 'views', + '../breakpad/breakpad.gyp:breakpad_handler', + ], + },{ # 'OS!="win" 'variables': { 'repack_path': '../tools/data_pack/repack.py', }, @@ -1527,8 +1592,10 @@ 'dependencies': [ 'browser', 'common', + 'resources', 'test_support', '../base/base.gyp:base', + '../skia/skia.gyp:skia', '../testing/gtest.gyp:gtest', ], 'include_dirs': [ @@ -1537,6 +1604,20 @@ 'sources': [ 'test/ui/run_all_unittests.cc', 'test/unit/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"', { @@ -1549,13 +1630,20 @@ # instead of the one in test/ui, and excludes all other files. The # runner in test/unit should not be built on Windows. ['OS=="win"', { - 'sources/': [ - ['exclude', '^test/unit/run_all_unittests\\.cc$'], + 'include_dirs': [ + 'third_party/wtl/include', + ], + 'sources!': [ + 'test/unit/run_all_unittests.cc', + ], + 'dependencies': [ + '../google_update/google_update.gyp:google_update', + 'views', ], }, { # else: OS!="win" 'sources/': [ ['exclude', ''], - ['include', '^test/unit/run_all_unittests\\.cc$'], + ['include', 'test/unit/run_all_unittests\\.cc$'], ], }], ], @@ -1569,6 +1657,7 @@ 'renderer', 'resources', 'test_support', + '../webkit/webkit.gyp:webkit', '../skia/skia.gyp:skia', '../testing/gtest.gyp:gtest', '../third_party/icu38/icu38.gyp:icui18n', @@ -1647,6 +1736,8 @@ '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/tab_restore_service_unittest.cc', 'browser/tab_contents/web_contents_unittest.cc', 'browser/tabs/tab_strip_model_unittest.cc', @@ -1700,9 +1791,32 @@ '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/test_notification_tracker.cc', + 'test/test_notification_tracker.h', 'test/unit/run_all_unittests.cc', ], 'conditions': [ + ['OS=="win"', { + 'defines': [ + '__STD_C', + '_CRT_SECURE_NO_DEPRECATE', + '_SCL_SECURE_NO_DEPRECATE', + ], + 'include_dirs': [ + 'third_party/wtl/include', + ], + 'sources!': [ + 'common/file_descriptor_set_unittest.cc', + 'common/net/url_util_unittest.cc', + ], + 'dependencies': [ + 'views', + ], + },], ['OS=="mac"', { # mac tests load the resources from the built app beside the test 'dependencies': ['app'], @@ -1736,6 +1850,8 @@ '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/tab_restore_service_unittest.cc', 'browser/tab_contents/web_contents_unittest.cc', 'browser/tabs/tab_strip_model_unittest.cc', @@ -1758,6 +1874,12 @@ '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/test_notification_tracker.cc', + 'test/test_notification_tracker.h', ], }], ], @@ -1788,5 +1910,241 @@ }, ]}, # 'targets' ], # OS=="mac" + ['OS=="win"', + { 'targets': [ + { + 'target_name': 'views', + 'type': 'static_library', + 'dependencies': [ + 'common', + 'resources', + '../media/media.gyp:media', + '../skia/skia.gyp:skia', + '../third_party/icu38/icu38.gyp:icui18n', + '../third_party/icu38/icu38.gyp:icuuc', + '../third_party/libxml/libxml.gyp:libxml', + '../third_party/npapi/npapi.gyp:npapi', + 'third_party/hunspell/hunspell.gyp:hunspell', + ], + '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. + 'views/accelerator.cc', + 'views/accelerator.h', + 'views/accelerator_handler.cc', + 'views/accelerator_handler.h', + 'views/accessibility/accessible_wrapper.cc', + 'views/accessibility/accessible_wrapper.h', + 'views/accessibility/view_accessibility.cc', + 'views/accessibility/view_accessibility.h', + 'views/aero_tooltip_manager.cc', + 'views/aero_tooltip_manager.h', + 'views/app_modal_dialog_delegate.h', + 'views/background.cc', + 'views/background.h', + 'views/base_button.cc', + 'views/base_button.h', + 'views/bitmap_scroll_bar.cc', + 'views/bitmap_scroll_bar.h', + 'views/border.cc', + 'views/border.h', + 'views/button.cc', + 'views/button.h', + 'views/button_dropdown.cc', + 'views/button_dropdown.h', + 'views/checkbox.cc', + 'views/checkbox.h', + 'views/chrome_menu.cc', + 'views/chrome_menu.h', + 'views/client_view.cc', + 'views/client_view.h', + 'views/combo_box.cc', + 'views/combo_box.h', + 'views/controller.h', + 'views/custom_frame_view.cc', + 'views/custom_frame_view.h', + 'views/decision.cc', + 'views/decision.h', + 'views/dialog_client_view.cc', + 'views/dialog_client_view.h', + 'views/dialog_delegate.cc', + 'views/dialog_delegate.h', + 'views/event.cc', + 'views/event.h', + 'views/external_focus_tracker.cc', + 'views/external_focus_tracker.h', + 'views/focus_manager.cc', + 'views/focus_manager.h', + 'views/grid_layout.cc', + 'views/grid_layout.h', + 'views/group_table_view.cc', + 'views/group_table_view.h', + 'views/hwnd_notification_source.h', + 'views/hwnd_view.cc', + 'views/hwnd_view.h', + 'views/image_view.cc', + 'views/image_view.h', + 'views/label.cc', + 'views/label.h', + 'views/layout_manager.cc', + 'views/layout_manager.h', + 'views/link.cc', + 'views/link.h', + 'views/menu.cc', + 'views/menu.h', + 'views/menu_button.cc', + 'views/menu_button.h', + 'views/message_box_view.cc', + 'views/message_box_view.h', + 'views/native_button.cc', + 'views/native_button.h', + 'views/native_control.cc', + 'views/native_control.h', + 'views/native_frame_view.cc', + 'views/native_frame_view.h', + 'views/native_scroll_bar.cc', + 'views/native_scroll_bar.h', + 'views/non_client_view.cc', + 'views/non_client_view.h', + 'views/painter.cc', + 'views/painter.h', + 'views/radio_button.cc', + 'views/radio_button.h', + 'views/repeat_controller.cc', + 'views/repeat_controller.h', + 'views/root_view.cc', + 'views/root_view.h', + 'views/root_view_drop_target.cc', + 'views/root_view_drop_target.h', + 'views/root_view_gtk.cc', + 'views/root_view_win.cc', + 'views/scroll_bar.cc', + 'views/scroll_bar.h', + 'views/scroll_view.cc', + 'views/scroll_view.h', + 'views/separator.cc', + 'views/separator.h', + 'views/single_split_view.cc', + 'views/single_split_view.h', + 'views/tabbed_pane.cc', + 'views/tabbed_pane.h', + 'views/table_view.cc', + 'views/table_view.h', + 'views/text_button.cc', + 'views/text_button.h', + 'views/text_field.cc', + 'views/text_field.h', + 'views/throbber.cc', + 'views/throbber.h', + 'views/tooltip_manager.cc', + 'views/tooltip_manager.h', + 'views/tree_model.h', + 'views/tree_node_iterator.h', + 'views/tree_node_model.h', + 'views/tree_view.cc', + 'views/tree_view.h', + 'views/view.cc', + 'views/view.h', + 'views/view_constants.cc', + 'views/view_constants.h', + 'views/view_gtk.cc', + 'views/view_menu_delegate.h', + 'views/view_storage.cc', + 'views/view_storage.h', + 'views/view_win.cc', + 'views/widget.h', + 'views/widget_win.cc', + 'views/widget_win.h', + 'views/window.cc', + 'views/window.h', + 'views/window_delegate.cc', + 'views/window_delegate.h', + 'views/window_resources.h', + ], + # These are layered in conditionals in the event other platforms + # end up using this module as well. + 'conditions': [ + ['OS=="win"', { + 'defines': [ + '__STD_C', + '_CRT_SECURE_NO_DEPRECATE', + '_SCL_SECURE_NO_DEPRECATE', + ], + 'include_dirs': [ + 'third_party/wtl/include', + ], + },], + ], + }, + { + 'target_name': 'plugin', + 'type': 'static_library', + 'dependencies': [ + 'common', + 'resources', + '../media/media.gyp:media', + '../skia/skia.gyp:skia', + '../third_party/icu38/icu38.gyp:icui18n', + '../third_party/icu38/icu38.gyp:icuuc', + '../third_party/libxml/libxml.gyp:libxml', + '../third_party/npapi/npapi.gyp:npapi', + 'third_party/hunspell/hunspell.gyp:hunspell', + ], + '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. + 'plugin/chrome_plugin_host.cc', + 'plugin/chrome_plugin_host.h', + 'plugin/npobject_proxy.cc', + 'plugin/npobject_proxy.h', + 'plugin/npobject_stub.cc', + 'plugin/npobject_stub.h', + 'plugin/npobject_util.cc', + 'plugin/npobject_util.h', + 'plugin/plugin_channel.cc', + 'plugin/plugin_channel.h', + 'plugin/plugin_channel_base.cc', + 'plugin/plugin_channel_base.h', + 'plugin/plugin_main.cc', + 'plugin/plugin_process.cc', + 'plugin/plugin_process.h', + 'plugin/plugin_thread.cc', + 'plugin/plugin_thread.h', + 'plugin/webplugin_delegate_stub.cc', + 'plugin/webplugin_delegate_stub.h', + 'plugin/webplugin_proxy.cc', + 'plugin/webplugin_proxy.h', + ], + # These are layered in conditionals in the event other platforms + # end up using this module as well. + 'conditions': [ + ['OS=="win"', { + 'defines': [ + '__STD_C', + '_CRT_SECURE_NO_DEPRECATE', + '_SCL_SECURE_NO_DEPRECATE', + ], + 'include_dirs': [ + 'third_party/wtl/include', + ], + },], + ], + }, + ]}, # 'targets' + ], # OS=="mac" ], # 'conditions' } diff --git a/chrome/installer/util/prebuild/util_prebuild.gyp b/chrome/installer/util/prebuild/util_prebuild.gyp new file mode 100644 index 0000000..1379e64 --- /dev/null +++ b/chrome/installer/util/prebuild/util_prebuild.gyp @@ -0,0 +1,34 @@ +{ + 'includes': [ + '../../../../build/common.gypi', + ], + 'targets': [ + { + 'target_name': 'installer_util_prebuild', + 'type': 'none', + 'actions': [ + { + 'action_name': 'installer_util_strings', + 'inputs': [ + 'create_string_rc.bat', + 'create_string_rc.py', + '../../../app/generated_resoruces.grd', + ], + 'outputs': [ + '<(SHARED_INTERMEDIATE_DIR)/installer_util_prebuild/installer_util_strings.rc', + '<(SHARED_INTERMEDIATE_DIR)/installer_util_prebuild/installer_util_strings.h', + ], + 'action': [ + './create_string_rc.bat', + '<(SHARED_INTERMEDIATE_DIR)/installer_util_prebuild' + ], + }, + ], + 'direct_dependent_settings': { + 'include_dirs': [ + '<(SHARED_INTERMEDIATE_DIR)/installer_util_prebuild', + ], + }, + }, + ], +} diff --git a/chrome/installer/util/util.gyp b/chrome/installer/util/util.gyp new file mode 100644 index 0000000..cdf18f3 --- /dev/null +++ b/chrome/installer/util/util.gyp @@ -0,0 +1,83 @@ +{ + 'includes': [ + '../../../build/common.gypi', + ], + 'targets': [ + { + 'target_name': 'installer_util', + 'type': 'static_library', + 'dependencies': [ + 'prebuild/util_prebuild.gyp:installer_util_prebuild', + '../../chrome.gyp:common', + '../../chrome.gyp:resources', + '../../../net/net.gyp:net_resources', + '../../../media/media.gyp:media', + '../../../skia/skia.gyp:skia', + '../../../third_party/icu38/icu38.gyp:icui18n', + '../../../third_party/icu38/icu38.gyp:icuuc', + '../../../third_party/libxml/libxml.gyp:libxml', + '../../../third_party/npapi/npapi.gyp:npapi', + '../../third_party/hunspell/hunspell.gyp:hunspell', + ], + 'include_dirs': [ + '../../..', + # TODO(bradnelson): this should probably come from a using using_lzma + # file but I'll put it here for now. + '../../../third_party/lzma_sdk', + ], + 'defines': [ + # TODO(bradnelson): this should probably come from a using using_lzma + # file but I'll put it here for now. + '_LZMA_IN_CB', + ], + 'sources': [ + 'browser_distribution.cc', + 'browser_distribution.h', + 'compat_checks.cc', + 'compat_checks.h', + 'copy_tree_work_item.cc', + 'copy_tree_work_item.h', + 'create_dir_work_item.cc', + 'create_dir_work_item.h', + 'create_reg_key_work_item.cc', + 'create_reg_key_work_item.h', + 'delete_reg_value_work_item.cc', + 'delete_reg_value_work_item.h', + 'delete_tree_work_item.cc', + 'delete_tree_work_item.h', + 'google_chrome_distribution.cc', + 'google_chrome_distribution.h', + 'google_update_constants.cc', + 'google_update_constants.h', + 'google_update_settings.cc', + 'google_update_settings.h', + 'helper.cc', + 'helper.h', + 'html_dialog.h', + 'html_dialog_impl.cc', + 'install_util.cc', + 'install_util.h', + 'l10n_string_util.cc', + 'l10n_string_util.h', + 'logging_installer.cc', + 'logging_installer.h', + 'lzma_util.cc', + 'lzma_util.h', + 'master_preferences.cc', + 'master_preferences.h', + 'set_reg_value_work_item.cc', + 'set_reg_value_work_item.h', + 'shell_util.cc', + 'shell_util.h', + 'util_constants.cc', + 'util_constants.h', + 'version.cc', + 'version.h', + 'work_item.cc', + 'work_item.h', + 'work_item_list.cc', + 'work_item_list.h', + ], + }, + ], +} diff --git a/google_update/google_update.gyp b/google_update/google_update.gyp new file mode 100644 index 0000000..e2a8ddc --- /dev/null +++ b/google_update/google_update.gyp @@ -0,0 +1,26 @@ +# Copyright (c) 2009 The Chromium Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +{ + 'includes': [ + '../build/common.gypi', + ], + 'targets': [ + { + 'target_name': 'google_update', + 'type': 'static_library', + 'sources': [ + 'google_update_idl.idl', + '<(INTERMEDIATE_DIR)/google_update_idl_i.c', + '<(INTERMEDIATE_DIR)/google_update_idl_p.c', + ], + 'direct_dependent_settings': { + 'include_dirs': [ + # Bit of a hack to work around the built in vstudio rule. + '<(INTERMEDIATE_DIR)/../google_update', + ], + }, + }, + ], +} |