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

Side by Side Diff: chrome/chrome_browser.gypi

Issue 10698106: Switch about box to web ui on Windows. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fixed a merge issue where ChromeOS started using google_update.h again. Created 8 years, 5 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 | Annotate | Revision Log
OLDNEW
1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 # 2 #
3 # Use of this source code is governed by a BSD-style license that can be 3 # Use of this source code is governed by a BSD-style license that can be
4 # found in the LICENSE file. 4 # found in the LICENSE file.
5 5
6 { 6 {
7 'targets': [ 7 'targets': [
8 { 8 {
9 'target_name': 'browser', 9 'target_name': 'browser',
10 'type': 'static_library', 10 'type': 'static_library',
(...skipping 1078 matching lines...) Expand 10 before | Expand all | Expand 10 after
1089 'browser/geolocation/geolocation_settings_state.cc', 1089 'browser/geolocation/geolocation_settings_state.cc',
1090 'browser/geolocation/geolocation_settings_state.h', 1090 'browser/geolocation/geolocation_settings_state.h',
1091 'browser/geolocation/wifi_data_provider_chromeos.cc', 1091 'browser/geolocation/wifi_data_provider_chromeos.cc',
1092 'browser/geolocation/wifi_data_provider_chromeos.h', 1092 'browser/geolocation/wifi_data_provider_chromeos.h',
1093 'browser/global_keyboard_shortcuts_mac.h', 1093 'browser/global_keyboard_shortcuts_mac.h',
1094 'browser/global_keyboard_shortcuts_mac.mm', 1094 'browser/global_keyboard_shortcuts_mac.mm',
1095 'browser/google/google_search_counter.cc', 1095 'browser/google/google_search_counter.cc',
1096 'browser/google/google_search_counter.h', 1096 'browser/google/google_search_counter.h',
1097 'browser/google/google_search_metrics.cc', 1097 'browser/google/google_search_metrics.cc',
1098 'browser/google/google_search_metrics.h', 1098 'browser/google/google_search_metrics.h',
1099 'browser/google/google_update.cc',
1100 'browser/google/google_update.h',
1101 'browser/google/google_update_settings_posix.cc', 1099 'browser/google/google_update_settings_posix.cc',
1100 'browser/google/google_update_win.cc',
1101 'browser/google/google_update_win.h',
1102 'browser/google/google_url_tracker.cc', 1102 'browser/google/google_url_tracker.cc',
1103 'browser/google/google_url_tracker.h', 1103 'browser/google/google_url_tracker.h',
1104 'browser/google/google_url_tracker_factory.cc', 1104 'browser/google/google_url_tracker_factory.cc',
1105 'browser/google/google_url_tracker_factory.h', 1105 'browser/google/google_url_tracker_factory.h',
1106 'browser/google/google_util.cc', 1106 'browser/google/google_util.cc',
1107 'browser/google/google_util.h', 1107 'browser/google/google_util.h',
1108 'browser/gpu_blacklist.cc', 1108 'browser/gpu_blacklist.cc',
1109 'browser/gpu_blacklist.h', 1109 'browser/gpu_blacklist.h',
1110 'browser/gpu_feature_checker.cc', 1110 'browser/gpu_feature_checker.cc',
1111 'browser/gpu_feature_checker.h', 1111 'browser/gpu_feature_checker.h',
(...skipping 2850 matching lines...) Expand 10 before | Expand all | Expand 10 after
3962 'browser/ui/webui/help/help_handler.h', 3962 'browser/ui/webui/help/help_handler.h',
3963 'browser/ui/webui/help/help_ui.cc', 3963 'browser/ui/webui/help/help_ui.cc',
3964 'browser/ui/webui/help/help_ui.h', 3964 'browser/ui/webui/help/help_ui.h',
3965 'browser/ui/webui/help/version_updater.h', 3965 'browser/ui/webui/help/version_updater.h',
3966 'browser/ui/webui/help/version_updater_basic.cc', 3966 'browser/ui/webui/help/version_updater_basic.cc',
3967 'browser/ui/webui/help/version_updater_basic.h', 3967 'browser/ui/webui/help/version_updater_basic.h',
3968 'browser/ui/webui/help/version_updater_chromeos.cc', 3968 'browser/ui/webui/help/version_updater_chromeos.cc',
3969 'browser/ui/webui/help/version_updater_chromeos.h', 3969 'browser/ui/webui/help/version_updater_chromeos.h',
3970 'browser/ui/webui/help/version_updater_mac.mm', 3970 'browser/ui/webui/help/version_updater_mac.mm',
3971 'browser/ui/webui/help/version_updater_mac.h', 3971 'browser/ui/webui/help/version_updater_mac.h',
3972 'browser/ui/webui/help/version_updater_win.cc',
3972 'browser/ui/webui/history_ui.cc', 3973 'browser/ui/webui/history_ui.cc',
3973 'browser/ui/webui/history_ui.h', 3974 'browser/ui/webui/history_ui.h',
3974 'browser/ui/webui/inspect_ui.cc', 3975 'browser/ui/webui/inspect_ui.cc',
3975 'browser/ui/webui/inspect_ui.h', 3976 'browser/ui/webui/inspect_ui.h',
3976 'browser/ui/webui/instant_ui.cc', 3977 'browser/ui/webui/instant_ui.cc',
3977 'browser/ui/webui/instant_ui.h', 3978 'browser/ui/webui/instant_ui.h',
3978 'browser/ui/webui/media/media_internals_handler.cc', 3979 'browser/ui/webui/media/media_internals_handler.cc',
3979 'browser/ui/webui/media/media_internals_handler.h', 3980 'browser/ui/webui/media/media_internals_handler.h',
3980 'browser/ui/webui/media/media_internals_proxy.cc', 3981 'browser/ui/webui/media/media_internals_proxy.cc',
3981 'browser/ui/webui/media/media_internals_proxy.h', 3982 'browser/ui/webui/media/media_internals_proxy.h',
(...skipping 619 matching lines...) Expand 10 before | Expand all | Expand 10 after
4601 ], 4602 ],
4602 }], 4603 }],
4603 ['use_aura==1', { 4604 ['use_aura==1', {
4604 'sources/': [ 4605 'sources/': [
4605 ['exclude', '^browser/automation/automation_provider_win.cc'], 4606 ['exclude', '^browser/automation/automation_provider_win.cc'],
4606 ['exclude', '^browser/automation/chrome_frame_automation_provider.cc '], 4607 ['exclude', '^browser/automation/chrome_frame_automation_provider.cc '],
4607 ['exclude', '^browser/automation/chrome_frame_automation_provider.h' ], 4608 ['exclude', '^browser/automation/chrome_frame_automation_provider.h' ],
4608 ['exclude', '^browser/automation/testing_automation_provider_win.cc' ], 4609 ['exclude', '^browser/automation/testing_automation_provider_win.cc' ],
4609 ['exclude', '^browser/first_run/try_chrome_dialog_view.cc'], 4610 ['exclude', '^browser/first_run/try_chrome_dialog_view.cc'],
4610 ['exclude', '^browser/first_run/try_chrome_dialog_view.h'], 4611 ['exclude', '^browser/first_run/try_chrome_dialog_view.h'],
4611 ['exclude', '^browser/google/google_update.cc'], 4612 ['exclude', '^browser/google/google_update_win.cc'],
4612 ['exclude', '^browser/google/google_update.h'], 4613 ['exclude', '^browser/google/google_update_win.h'],
4613 ['exclude', '^browser/hang_monitor/hung_plugin_action.cc'], 4614 ['exclude', '^browser/hang_monitor/hung_plugin_action.cc'],
4614 ['exclude', '^browser/hang_monitor/hung_plugin_action.h'], 4615 ['exclude', '^browser/hang_monitor/hung_plugin_action.h'],
4615 ['exclude', '^browser/hang_monitor/hung_window_detector.cc'], 4616 ['exclude', '^browser/hang_monitor/hung_window_detector.cc'],
4616 ['exclude', '^browser/hang_monitor/hung_window_detector.h'], 4617 ['exclude', '^browser/hang_monitor/hung_window_detector.h'],
4617 ['exclude', '^browser/lifetime/application_lifetime_stub.cc'], 4618 ['exclude', '^browser/lifetime/application_lifetime_stub.cc'],
4618 ['exclude', '^browser/renderer_host/render_widget_host_view_views*'] , 4619 ['exclude', '^browser/renderer_host/render_widget_host_view_views*'] ,
4619 ['exclude', '^browser/tab_contents/web_drag_bookmark_handler_win.cc' ], 4620 ['exclude', '^browser/tab_contents/web_drag_bookmark_handler_win.cc' ],
4620 ['exclude', '^browser/tab_contents/web_drag_bookmark_handler_win.h'] , 4621 ['exclude', '^browser/tab_contents/web_drag_bookmark_handler_win.h'] ,
4621 ['exclude', '^browser/ui/panels/display_settings_provider_win.cc'], 4622 ['exclude', '^browser/ui/panels/display_settings_provider_win.cc'],
4622 ['exclude', '^browser/ui/panels/taskbar_window_thumbnailer_win.cc'], 4623 ['exclude', '^browser/ui/panels/taskbar_window_thumbnailer_win.cc'],
(...skipping 496 matching lines...) Expand 10 before | Expand all | Expand 10 after
5119 'browser/importer/nss_decryptor_system_nss.h', 5120 'browser/importer/nss_decryptor_system_nss.h',
5120 'browser/lifetime/application_lifetime_stub.cc', 5121 'browser/lifetime/application_lifetime_stub.cc',
5121 'browser/ui/certificate_dialogs.cc', 5122 'browser/ui/certificate_dialogs.cc',
5122 'browser/ui/certificate_dialogs.h', 5123 'browser/ui/certificate_dialogs.h',
5123 'browser/ui/crypto_module_password_dialog.cc', 5124 'browser/ui/crypto_module_password_dialog.cc',
5124 'browser/ui/crypto_module_password_dialog_nss.cc', 5125 'browser/ui/crypto_module_password_dialog_nss.cc',
5125 'browser/ui/startup/autolaunch_prompt.cc', 5126 'browser/ui/startup/autolaunch_prompt.cc',
5126 'browser/ui/views/keyboard_overlay_delegate.cc', 5127 'browser/ui/views/keyboard_overlay_delegate.cc',
5127 'browser/ui/views/keyboard_overlay_dialog_view.cc', 5128 'browser/ui/views/keyboard_overlay_dialog_view.cc',
5128 'browser/ui/views/simple_message_box_views.cc', 5129 'browser/ui/views/simple_message_box_views.cc',
5130 'browser/ui/webui/help/version_updater_basic.cc',
5131 'browser/ui/webui/help/version_updater_basic.h',
5129 'browser/ui/webui/tab_modal_confirm_dialog_webui.cc', 5132 'browser/ui/webui/tab_modal_confirm_dialog_webui.cc',
5130 'browser/ui/webui/tab_modal_confirm_dialog_webui.h', 5133 'browser/ui/webui/tab_modal_confirm_dialog_webui.h',
5131 ], 5134 ],
5132 'conditions': [ 5135 'conditions': [
5133 ['win_use_allocator_shim==1', { 5136 ['win_use_allocator_shim==1', {
5134 'dependencies': [ 5137 'dependencies': [
5135 '<(allocator_target)', 5138 '<(allocator_target)',
5136 ], 5139 ],
5137 }], 5140 }],
5138 ], 5141 ],
5139 }, { # 'OS!="win" 5142 }, { # 'OS!="win"
5140 'sources/': [ 5143 'sources/': [
5141 # Exclude files that should be excluded for all non-Windows platform s. 5144 # Exclude files that should be excluded for all non-Windows platform s.
5142 ['exclude', '^browser/first_run/try_chrome_dialog_view.cc'], 5145 ['exclude', '^browser/first_run/try_chrome_dialog_view.cc'],
5143 ['exclude', '^browser/first_run/try_chrome_dialog_view.h'], 5146 ['exclude', '^browser/first_run/try_chrome_dialog_view.h'],
5144 ['exclude', '^browser/google/google_update.cc'],
5145 ['exclude', '^browser/importer/ie_importer.cc'], 5147 ['exclude', '^browser/importer/ie_importer.cc'],
5146 ['exclude', '^browser/ui/network_profile_bubble.cc'], 5148 ['exclude', '^browser/ui/network_profile_bubble.cc'],
5147 ['exclude', '^browser/ui/network_profile_bubble.h'], 5149 ['exclude', '^browser/ui/network_profile_bubble.h'],
5148 ['exclude', '^browser/ui/webui/set_as_default_browser_ui.cc'], 5150 ['exclude', '^browser/ui/webui/set_as_default_browser_ui.cc'],
5149 ['exclude', '^browser/ui/webui/set_as_default_browser_ui.h'], 5151 ['exclude', '^browser/ui/webui/set_as_default_browser_ui.h'],
5150 5152
5151 # Exclude all of hang_monitor. 5153 # Exclude all of hang_monitor.
5152 ['exclude', '^browser/hang_monitor/'], 5154 ['exclude', '^browser/hang_monitor/'],
5153 5155
5154 # Exclude parts of password_manager. 5156 # Exclude parts of password_manager.
5155 ['exclude', '^browser/password_manager/ie7_password\\.cc$'], 5157 ['exclude', '^browser/password_manager/ie7_password\\.cc$'],
5156 ], 5158 ],
5157 'conditions': [ 5159 'conditions': [
5158 ['use_aura==1',{ 5160 ['use_aura==1',{
5159 'dependencies': [ 5161 'dependencies': [
5160 '../build/linux/system.gyp:dbus', 5162 '../build/linux/system.gyp:dbus',
5161 '../build/linux/system.gyp:fontconfig', 5163 '../build/linux/system.gyp:fontconfig',
5162 '../build/linux/system.gyp:x11', 5164 '../build/linux/system.gyp:x11',
5163 '../dbus/dbus.gyp:dbus', 5165 '../dbus/dbus.gyp:dbus',
5164 '../ui/views/views.gyp:views', 5166 '../ui/views/views.gyp:views',
5165 ], 5167 ],
5166 'include_dirs': [ 5168 'include_dirs': [
5167 '<(INTERMEDIATE_DIR)', 5169 '<(INTERMEDIATE_DIR)',
5168 '<(INTERMEDIATE_DIR)/chrome', 5170 '<(INTERMEDIATE_DIR)/chrome',
5169 ], 5171 ],
5170 'sources/': [ 5172 'sources/': [
5171 ['exclude', '^browser/google/google_update.cc'],
5172 ['exclude', '^browser/google/google_update.h'],
5173 ['exclude', '^browser/platform_util_common_linux.cc'], 5173 ['exclude', '^browser/platform_util_common_linux.cc'],
5174 ['exclude', '^browser/ui/views/frame/app_panel_browser_frame_vie w.cc'], 5174 ['exclude', '^browser/ui/views/frame/app_panel_browser_frame_vie w.cc'],
5175 ['exclude', '^browser/ui/views/frame/app_panel_browser_frame_vie w.h'], 5175 ['exclude', '^browser/ui/views/frame/app_panel_browser_frame_vie w.h'],
5176 ['exclude', '^browser/ui/views/indexed_db_info_view.cc'], 5176 ['exclude', '^browser/ui/views/indexed_db_info_view.cc'],
5177 ['exclude', '^browser/ui/views/indexed_db_info_view.h'], 5177 ['exclude', '^browser/ui/views/indexed_db_info_view.h'],
5178 ['exclude', '^browser/ui/views/local_storage_info_view.cc'], 5178 ['exclude', '^browser/ui/views/local_storage_info_view.cc'],
5179 ['exclude', '^browser/ui/views/local_storage_info_view.h'], 5179 ['exclude', '^browser/ui/views/local_storage_info_view.h'],
5180 ['exclude', '^browser/ui/views/local_storage_set_item_info_view. cc'], 5180 ['exclude', '^browser/ui/views/local_storage_set_item_info_view. cc'],
5181 ['exclude', '^browser/ui/views/local_storage_set_item_info_view. h'], 5181 ['exclude', '^browser/ui/views/local_storage_set_item_info_view. h'],
5182 ['exclude', '^browser/ui/views/select_file_dialog_aura.cc'], 5182 ['exclude', '^browser/ui/views/select_file_dialog_aura.cc'],
(...skipping 223 matching lines...) Expand 10 before | Expand all | Expand 10 after
5406 'browser/metrics/proto/study.proto', 5406 'browser/metrics/proto/study.proto',
5407 ], 5407 ],
5408 'variables': { 5408 'variables': {
5409 'proto_in_dir': 'browser/metrics/proto', 5409 'proto_in_dir': 'browser/metrics/proto',
5410 'proto_out_dir': 'chrome/browser/metrics/proto', 5410 'proto_out_dir': 'chrome/browser/metrics/proto',
5411 }, 5411 },
5412 'includes': [ '../build/protoc.gypi' ] 5412 'includes': [ '../build/protoc.gypi' ]
5413 }, 5413 },
5414 ], 5414 ],
5415 } 5415 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698