diff options
| -rw-r--r-- | base/base.gyp | 4 | ||||
| -rw-r--r-- | base/base.gypi | 7 | ||||
| -rw-r--r-- | breakpad/breakpad.gyp | 2 | ||||
| -rw-r--r-- | chrome/chrome.gyp | 1 | ||||
| -rw-r--r-- | chrome/chrome_browser.gypi | 45 | ||||
| -rw-r--r-- | chrome/chrome_common.gypi | 2 | ||||
| -rw-r--r-- | chrome/chrome_tests.gypi | 8 | ||||
| -rw-r--r-- | content/content_browser.gypi | 2 | ||||
| -rw-r--r-- | content/content_common.gypi | 2 | ||||
| -rw-r--r-- | net/net.gyp | 9 | ||||
| -rw-r--r-- | remoting/remoting.gyp | 4 | ||||
| -rw-r--r-- | skia/skia.gyp | 1 | ||||
| -rw-r--r-- | views/views.gyp | 6 |
13 files changed, 14 insertions, 79 deletions
diff --git a/base/base.gyp b/base/base.gyp index 60d0a28..8c3dfce 100644 --- a/base/base.gyp +++ b/base/base.gyp @@ -284,9 +284,9 @@ ['exclude', '^win/'], ], 'sources!': [ + 'debug/trace_event_win_unittest.cc', 'time_win_unittest.cc', - 'trace_event_win_unittest.cc', - 'win_util_unittest.cc', + 'win/win_util_unittest.cc', ], }], ], diff --git a/base/base.gypi b/base/base.gypi index c31809e..5a87c66 100644 --- a/base/base.gypi +++ b/base/base.gypi @@ -384,7 +384,7 @@ ], [ 'OS != "mac"', { 'sources!': [ - 'scoped_aedesc.h' + 'mac/scoped_aedesc.h' ], }], # For now, just test the *BSD platforms enough to exclude them. @@ -526,13 +526,8 @@ 'dependencies': ['../third_party/libevent/libevent.gyp:libevent'], 'sources!': [ 'third_party/purify/pure_api.c', - 'base_drag_source.cc', - 'base_drop_target.cc', 'event_recorder.cc', - 'file_version_info.cc', - 'registry.cc', 'resource_util.cc', - 'win_util.cc', ], },], [ 'component=="shared_library"', { diff --git a/breakpad/breakpad.gyp b/breakpad/breakpad.gyp index fb01fa7..3ac15e1 100644 --- a/breakpad/breakpad.gyp +++ b/breakpad/breakpad.gyp @@ -309,7 +309,6 @@ 'src/common/linux/libcurl_wrapper.cc', 'src/common/linux/libcurl_wrapper.h', 'src/common/linux/linux_libc_support.h', - 'src/common/linux/linux_syscall_support.h', 'src/common/memory.h', 'src/common/string_conversion.cc', 'src/common/string_conversion.h', @@ -346,7 +345,6 @@ 'src/processor/logging.cc', 'src/processor/logging.h', 'src/processor/minidump.cc', - 'src/processor/minidump.h', 'src/processor/pathname_stripper.cc', 'src/processor/pathname_stripper.h', ], diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp index fa1c008..7a00ca7 100644 --- a/chrome/chrome.gyp +++ b/chrome/chrome.gyp @@ -762,7 +762,6 @@ 'browser/sync/notifier/sync_notifier.h', 'browser/sync/notifier/sync_notifier_factory.h', 'browser/sync/notifier/sync_notifier_factory.cc', - 'browser/sync/notifier/sync_notifier_callback.h', ], 'include_dirs': [ '..', diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi index 850255f..662ebb9 100644 --- a/chrome/chrome_browser.gypi +++ b/chrome/chrome_browser.gypi @@ -2920,6 +2920,7 @@ 'browser/ui/views/autocomplete/autocomplete_popup_contents_view.h', 'browser/ui/views/autocomplete/autocomplete_result_view.cc', 'browser/ui/views/autocomplete/autocomplete_result_view.h', + 'browser/ui/views/autocomplete/autocomplete_result_view_model.h', 'browser/ui/views/autocomplete/touch_autocomplete_popup_contents_view.cc', 'browser/ui/views/autocomplete/touch_autocomplete_popup_contents_view.h', 'browser/ui/views/bookmarks/bookmark_bar_instructions_view.cc', @@ -3550,7 +3551,6 @@ ['exclude', 'browser/renderer_host/offline_resource_handler.h'], ['exclude', 'browser/ui/login/login_prompt_ui.cc'], ['exclude', 'browser/ui/webui/active_downloads_ui.cc'], - ['exclude', 'browser/ui/webui/chrome_about_ui.cc'], ['exclude', 'browser/ui/webui/collected_cookies_ui_delegate.cc'], ['exclude', 'browser/ui/webui/collected_cookies_ui_delegate.h'], ['exclude', 'browser/ui/webui/cookies_tree_model_adapter.cc'], @@ -3594,13 +3594,13 @@ ['exclude', '^browser/chromeos/login/dom_*'], ['exclude', '^browser/extensions/extension_input_ui_api.cc'], ['exclude', '^browser/extensions/extension_input_ui_api.h'], - ['exclude', '^browser/webui/keyboard_ui.*'], ['exclude', '^browser/renderer_host/render_widget_host_view_views.*'], ['exclude', '^browser/ui/touch/*'], ['exclude', '^browser/ui/views/tab_contents/tab_contents_container_views.cc'], ['exclude', '^browser/ui/views/tab_contents/tab_contents_container_views.h'], ['exclude', '^browser/ui/views/tab_contents/tab_contents_view_touch.*'], ['exclude', '^browser/ui/webui/chromeos/login/'], + ['exclude', '^browser/ui/webui/keyboard_ui.*'], ], }], ['touchui==1', { @@ -3984,7 +3984,6 @@ ['include', '^browser/ui/gtk/omnibox/omnibox_view_gtk.h'], ['include', '^browser/ui/gtk/owned_widget_gtk.cc'], ['include', '^browser/ui/gtk/owned_widget_gtk.h'], - ['include', '^browser/ui/gtk/popup_blocked_animation_gtk.cc'], ['include', '^browser/ui/gtk/repost_form_warning_gtk.cc'], ['include', '^browser/ui/gtk/repost_form_warning_gtk.h'], ['include', '^browser/ui/gtk/ssl_client_certificate_selector.cc'], @@ -3994,7 +3993,8 @@ ['include', '^browser/ui/gtk/task_manager_gtk.h'], ['include', '^browser/ui/gtk/view_id_util.cc'], ['include', '^browser/ui/gtk/view_id_util.h'], - + ['include', '^browser/ui/profile_menu_model.cc'], + ['include', '^browser/ui/profile_menu_model.h'], ['include', '^browser/ui/tabs/dock_info.cc'], ['include', '^browser/ui/tabs/dock_info.h'], ['include', '^browser/ui/views/about_chrome_view.cc'], @@ -4007,8 +4007,6 @@ ['include', '^browser/ui/views/accessible_pane_view.h'], ['include', '^browser/ui/views/autocomplete/autocomplete_popup_contents_view.cc'], ['include', '^browser/ui/views/autocomplete/autocomplete_popup_contents_view.h'], - ['include', '^browser/ui/views/autocomplete/autocomplete_popup_gtk.cc'], - ['include', '^browser/ui/views/autocomplete/autocomplete_popup_gtk.h'], ['include', '^browser/ui/views/autocomplete/autocomplete_result_view.cc'], ['include', '^browser/ui/views/autocomplete/autocomplete_result_view.h'], ['include', '^browser/ui/views/autocomplete/autocomplete_result_view_model.h'], @@ -4065,8 +4063,6 @@ ['include', '^browser/ui/views/download/download_shelf_context_menu_view.h'], ['include', '^browser/ui/views/download/download_shelf_view.cc'], ['include', '^browser/ui/views/download/download_shelf_view.h'], - ['include', '^browser/ui/views/dragged_tab_controller.cc'], - ['include', '^browser/ui/views/dragged_tab_controller.h'], ['include', '^browser/ui/views/dropdown_bar_host.cc'], ['include', '^browser/ui/views/dropdown_bar_host.h'], ['include', '^browser/ui/views/dropdown_bar_host_gtk.cc'], @@ -4074,8 +4070,6 @@ ['include', '^browser/ui/views/dropdown_bar_view.h'], ['include', '^browser/ui/views/event_utils.cc'], ['include', '^browser/ui/views/event_utils.h'], - ['include', '^browser/ui/views/extension_view.cc'], - ['include', '^browser/ui/views/extension_view.h'], ['include', '^browser/ui/views/extensions/browser_action_drag_data.cc'], ['include', '^browser/ui/views/extensions/browser_action_drag_data.h'], ['include', '^browser/ui/views/extensions/browser_action_overflow_menu_controller.cc'], @@ -4152,30 +4146,15 @@ ['include', '^browser/ui/views/location_bar/selected_keyword_view.h'], ['include', '^browser/ui/views/location_bar/star_view.cc'], ['include', '^browser/ui/views/location_bar/star_view.h'], - ['include', '^browser/ui/views/location_bar_view.cc'], - ['include', '^browser/ui/views/location_bar_view.h'], ['include', '^browser/ui/views/notifications/balloon_view_host.cc'], ['include', '^browser/ui/views/notifications/balloon_view_host.h'], ['include', '^browser/ui/views/omnibox/omnibox_view_views.cc'], ['include', '^browser/ui/views/omnibox/omnibox_view_views.h'], ['include', '^browser/ui/views/page_info_bubble_view.cc'], - ['include', '^browser/ui/views/panel_controller.cc'], - ['include', '^browser/ui/views/panel_controller.h'], - ['include', '^browser/ui/views/panels/panel_container.cc'], - ['include', '^browser/ui/views/panels/panel_container.h'], - ['include', '^browser/ui/views/panels/panel_scroller.cc'], - ['include', '^browser/ui/views/panels/panel_scroller.h'], - # Not necessary unless you're trying to build ChromeOS+views. - #['include', '^browser/ui/views/panels/panel_scroller_container.cc'], - #['include', '^browser/ui/views/panels/panel_scroller_container.h'], - ['include', '^browser/ui/views/panels/panel_scroller_header.cc'], - ['include', '^browser/ui/views/panels/panel_scroller_header.h'], ['include', '^browser/ui/views/pinned_contents_info_bubble.cc'], ['include', '^browser/ui/views/pinned_contents_info_bubble.h'], ['include', '^browser/ui/views/profile_menu_button.cc'], ['include', '^browser/ui/views/profile_menu_button.h'], - ['include', '^browser/ui/views/profile_menu_model.cc'], - ['include', '^browser/ui/views/profile_menu_model.h'], ['include', '^browser/ui/views/profile_tag_view.cc'], ['include', '^browser/ui/views/profile_tag_view.h'], ['include', '^browser/ui/views/reload_button.cc'], @@ -4209,8 +4188,6 @@ ['include', '^browser/ui/views/tabs/base_tab.h'], ['include', '^browser/ui/views/tabs/base_tab_strip.cc'], ['include', '^browser/ui/views/tabs/base_tab_strip.h'], - ['include', '^browser/ui/views/tabs/browser_tab_strip.cc'], - ['include', '^browser/ui/views/tabs/browser_tab_strip.h'], ['include', '^browser/ui/views/tabs/browser_tab_strip_controller.cc'], ['include', '^browser/ui/views/tabs/browser_tab_strip_controller.h'], ['include', '^browser/ui/views/tabs/dragged_tab_controller.cc'], @@ -4231,8 +4208,6 @@ ['include', '^browser/ui/views/tabs/tab_renderer_data.h'], ['include', '^browser/ui/views/tabs/tab_strip.cc'], ['include', '^browser/ui/views/tabs/tab_strip.h'], - ['include', '^browser/ui/views/tabs/tab_strip_2.cc'], - ['include', '^browser/ui/views/tabs/tab_strip_2.h'], ['include', '^browser/ui/views/tabs/tab_strip_factory.cc'], ['include', '^browser/ui/views/tabs/tab_strip_factory.h'], ['include', '^browser/ui/views/textfield_views.cc'], @@ -4247,8 +4222,6 @@ ['include', '^browser/ui/views/unhandled_keyboard_event_handler.h'], ['include', '^browser/ui/views/update_recommended_message_box.cc'], ['include', '^browser/ui/views/update_recommended_message_box.h'], - ['include', '^browser/ui/views/view_text_utils.cc'], - ['include', '^browser/ui/views/view_text_utils.h'], ['include', '^browser/ui/views/window.cc'], ['include', '^browser/ui/views/window.h'], ['include', '^browser/ui/views/wrench_menu.cc'], @@ -4261,7 +4234,8 @@ ['exclude', '^browser/autocomplete/autocomplete_popup_view_gtk.h'], ['exclude', '^browser/extensions/extension_host_mac.h'], ['exclude', '^browser/extensions/extension_host_mac.mm'], - ['exclude', '^browser/extensions/external_registry_extension_provider_win.cc'], + ['exclude', '^browser/extensions/external_registry_extension_loader_win.cc'], + ['exclude', '^browser/extensions/external_registry_extension_loader_win.h'], ['exclude', '^browser/speech/speech_input_bubble_gtk.cc'], ['exclude', '^browser/tab_contents/render_view_context_menu_gtk.cc'], ['exclude', '^browser/tab_contents/render_view_context_menu_gtk.h'], @@ -4316,8 +4290,6 @@ ['include', '^browser/printing/print_dialog_gtk.h'], ['exclude', '^browser/bookmarks/bookmark_drop_info.cc'], ['exclude', '^browser/ui/browser_list_stub.cc'], - ['exclude', '^browser/ui/views/autocomplete/autocomplete_popup_gtk.cc'], - ['exclude', '^browser/ui/views/autocomplete/autocomplete_popup_gtk.h'], ['exclude', '^browser/ui/panels/panel_browser_frame_view.cc'], ['exclude', '^browser/ui/panels/panel_browser_frame_view.h'], ['exclude', '^browser/ui/panels/panel_browser_view.cc'], @@ -4414,13 +4386,8 @@ 'browser/accessibility/browser_accessibility_win.h', 'browser/aeropeek_manager.cc', 'browser/autocomplete/autocomplete_accessibility.cc', - 'browser/bookmarks/bookmark_menu_controller.cc', - 'browser/bookmarks/bookmark_menu_controller.h', 'browser/extensions/extension_tts_api_win.cc', 'browser/google/google_update.cc', - 'browser/history/history_indexer.idl', - 'browser/history_tab_ui.cc', - 'browser/history_view.cc', 'browser/importer/ie_importer.cc', ], }], diff --git a/chrome/chrome_common.gypi b/chrome/chrome_common.gypi index c156aa1..25a4363 100644 --- a/chrome/chrome_common.gypi +++ b/chrome/chrome_common.gypi @@ -186,7 +186,7 @@ 'common/extensions/extension_unpacker.cc', 'common/extensions/extension_unpacker.h', 'common/extensions/file_browser_handler.cc', - 'common/extensions/file_browser_hanlder.h', + 'common/extensions/file_browser_handler.h', 'common/extensions/update_manifest.cc', 'common/extensions/update_manifest.h', 'common/extensions/url_pattern.cc', diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi index 7189d90..0c90bf8 100644 --- a/chrome/chrome_tests.gypi +++ b/chrome/chrome_tests.gypi @@ -1419,7 +1419,6 @@ 'browser/instant/instant_loader_manager_unittest.cc', 'browser/instant/promo_counter_unittest.cc', 'browser/internal_auth_unittest.cc', - 'browser/internal_auth_unittest.h', 'browser/mach_broker_mac_unittest.cc', 'browser/metrics/metrics_log_unittest.cc', 'browser/metrics/metrics_response_unittest.cc', @@ -2015,8 +2014,6 @@ 'browser/ui/gtk/gtk_chrome_shrinkable_hbox_unittest.cc', 'browser/ui/gtk/gtk_expanded_container_unittest.cc', 'browser/ui/gtk/gtk_theme_service_unittest.cc', - 'browser/ui/gtk/options/cookies_view_unittest.cc', - 'browser/ui/gtk/options/languages_page_gtk_unittest.cc', 'browser/ui/gtk/reload_button_gtk_unittest.cc', 'browser/ui/gtk/status_icons/status_tray_gtk_unittest.cc', ], @@ -2169,16 +2166,12 @@ 'browser/accessibility/browser_accessibility_win_unittest.cc', 'browser/bookmarks/bookmark_codec_unittest.cc', 'browser/bookmarks/bookmark_node_data_unittest.cc', - 'browser/chrome_plugin_unittest.cc', 'browser/extensions/extension_process_manager_unittest.cc', - 'browser/login_prompt_unittest.cc', 'browser/rlz/rlz_unittest.cc', 'browser/search_engines/template_url_scraper_unittest.cc', 'browser/ui/views/bookmarks/bookmark_editor_view_unittest.cc', 'browser/ui/views/extensions/browser_action_drag_data_unittest.cc', - 'browser/ui/views/find_bar_host_unittest.cc', 'browser/ui/views/generic_info_view_unittest.cc', - 'browser/ui/views/keyword_editor_view_unittest.cc', 'test/data/resource.rc', ], }], @@ -2259,7 +2252,6 @@ 'browser/chromeos/cros/cros_mock.cc', 'browser/chromeos/cros/cros_mock.h', 'browser/chromeos/cros/mock_cros_library.h', - 'browser/chromeos/cros/mock_keyboard_library.h', 'browser/chromeos/cros/mock_input_method_library.cc', 'browser/chromeos/cros/mock_input_method_library.h', 'browser/chromeos/cros/mock_mount_library.cc', diff --git a/content/content_browser.gypi b/content/content_browser.gypi index 35d015a..6755661 100644 --- a/content/content_browser.gypi +++ b/content/content_browser.gypi @@ -73,7 +73,7 @@ 'browser/file_system/file_system_dispatcher_host.cc', 'browser/file_system/file_system_dispatcher_host.h', 'browser/font_list_async.cc', - 'browser/font_list_asnyc.h', + 'browser/font_list_async.h', 'browser/geolocation/access_token_store.h', 'browser/geolocation/arbitrator_dependency_factory.cc', 'browser/geolocation/arbitrator_dependency_factory.h', diff --git a/content/content_common.gypi b/content/content_common.gypi index a7d98ad..24d9bee 100644 --- a/content/content_common.gypi +++ b/content/content_common.gypi @@ -120,7 +120,7 @@ 'common/gpu/gpu_info.cc', 'common/gpu/gpu_info.h', 'common/gpu/gpu_messages.h', - 'common/gpu/gpu_process_launch_casues.h', + 'common/gpu/gpu_process_launch_causes.h', 'common/gpu/gpu_surface_stub.cc', 'common/gpu/gpu_surface_stub.h', 'common/gpu/gpu_video_decode_accelerator.cc', diff --git a/net/net.gyp b/net/net.gyp index 1931bea..8d4c175 100644 --- a/net/net.gyp +++ b/net/net.gyp @@ -1025,11 +1025,6 @@ 'base/dnssec_unittest.cc', ], }, - { # else, remove openssl specific tests - 'sources!': [ - 'base/x509_openssl_util_unittest.cc', - ], - } ], [ 'OS == "win"', { 'sources!': [ @@ -1337,7 +1332,6 @@ 'tools/flip_server/loadtime_measurement.h', 'tools/flip_server/mem_cache.h', 'tools/flip_server/mem_cache.cc', - 'tools/flip_server/porting.txt', 'tools/flip_server/output_ordering.cc', 'tools/flip_server/output_ordering.h', 'tools/flip_server/ring_buffer.cc', @@ -1358,9 +1352,6 @@ 'tools/flip_server/streamer_interface.cc', 'tools/flip_server/streamer_interface.h', 'tools/flip_server/string_piece_utils.h', - 'tools/flip_server/thread.h', - 'tools/flip_server/url_to_filename_encoder.h', - 'tools/flip_server/url_utilities.h', ], }, { diff --git a/remoting/remoting.gyp b/remoting/remoting.gyp index 2c68af1..3e5d239 100644 --- a/remoting/remoting.gyp +++ b/remoting/remoting.gyp @@ -263,7 +263,7 @@ 'base/rate_counter.cc', 'base/rate_counter.h', 'base/running_average.cc', - 'base/running_avarage.h', + 'base/running_average.h', 'base/tracer.cc', 'base/tracer.h', 'base/types.h', @@ -488,7 +488,7 @@ 'protocol/buffered_socket_writer.cc', 'protocol/buffered_socket_writer.h', 'protocol/client_control_sender.cc', - 'protocol/client_control_Sender.h', + 'protocol/client_control_sender.h', 'protocol/client_message_dispatcher.cc', 'protocol/client_message_dispatcher.h', 'protocol/client_stub.h', diff --git a/skia/skia.gyp b/skia/skia.gyp index 3c7bd12..a93d075 100644 --- a/skia/skia.gyp +++ b/skia/skia.gyp @@ -63,7 +63,6 @@ '../third_party/skia/gpu/include/GrGLConfig_chrome.h', '../third_party/skia/gpu/include/GrGLIndexBuffer.h', '../third_party/skia/gpu/include/GrGLInterface.h', - '../third_party/skia/gpu/include/GrGLPlatformIncludes.h', '../third_party/skia/gpu/include/GrGLTexture.h', '../third_party/skia/gpu/include/GrGLVertexBuffer.h', '../third_party/skia/gpu/include/GrGlyph.h', diff --git a/views/views.gyp b/views/views.gyp index f103475..c1e24cd 100644 --- a/views/views.gyp +++ b/views/views.gyp @@ -411,22 +411,16 @@ 'sources!': [ 'accessibility/native_view_accessibility_win.cc', 'controls/scrollbar/bitmap_scroll_bar.cc', - 'controls/combo_box.cc', - 'controls/hwnd_view.cc', 'controls/native_control.cc', 'controls/table/group_table_view.cc', - 'controls/table/table_model.cc', 'controls/table/table_view.cc', 'controls/table/group_table_view.cc', 'controls/tree/tree_view.cc', 'events/event_win.cc', - 'resize_corner.cc', 'widget/aero_tooltip_manager.cc', 'widget/child_window_message_processor.cc', 'widget/child_window_message_processor.h', 'widget/native_widget_win.cc', - 'widget/root_view_drop_target.cc', - 'window/hit_test.cc', 'window/native_frame_view.cc', ], }], |