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

Side by Side Diff: chrome/chrome_browser.gypi

Issue 10820031: Modifications to performance monitor UI to address real webui. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Final touchups for style. Created 8 years, 4 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
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 3240 matching lines...) Expand 10 before | Expand all | Expand 10 after
3251 'browser/ui/intents/web_intent_picker_model.cc', 3251 'browser/ui/intents/web_intent_picker_model.cc',
3252 'browser/ui/intents/web_intent_picker_model.h', 3252 'browser/ui/intents/web_intent_picker_model.h',
3253 'browser/ui/intents/web_intent_picker_model_observer.h', 3253 'browser/ui/intents/web_intent_picker_model_observer.h',
3254 'browser/ui/intents/web_intents_model.cc', 3254 'browser/ui/intents/web_intents_model.cc',
3255 'browser/ui/intents/web_intents_model.h', 3255 'browser/ui/intents/web_intents_model.h',
3256 'browser/ui/login/login_model.h', 3256 'browser/ui/login/login_model.h',
3257 'browser/ui/login/login_prompt.cc', 3257 'browser/ui/login/login_prompt.cc',
3258 'browser/ui/login/login_prompt.h', 3258 'browser/ui/login/login_prompt.h',
3259 'browser/ui/media_stream_infobar_delegate.h', 3259 'browser/ui/media_stream_infobar_delegate.h',
3260 'browser/ui/media_stream_infobar_delegate.cc', 3260 'browser/ui/media_stream_infobar_delegate.cc',
3261 'browser/ui/metro_pinned_state_observer.h',
3262 'browser/ui/metro_pin_tab_helper.cc', 3261 'browser/ui/metro_pin_tab_helper.cc',
3263 'browser/ui/metro_pin_tab_helper.h', 3262 'browser/ui/metro_pin_tab_helper.h',
3264 'browser/ui/network_profile_bubble.cc', 3263 'browser/ui/network_profile_bubble.cc',
3265 'browser/ui/network_profile_bubble.h', 3264 'browser/ui/network_profile_bubble.h',
3266 'browser/ui/omnibox/location_bar.h', 3265 'browser/ui/omnibox/location_bar.h',
3267 'browser/ui/omnibox/location_bar_util.cc', 3266 'browser/ui/omnibox/location_bar_util.cc',
3268 'browser/ui/omnibox/location_bar_util.h', 3267 'browser/ui/omnibox/location_bar_util.h',
3269 'browser/ui/omnibox/omnibox_edit_controller.h', 3268 'browser/ui/omnibox/omnibox_edit_controller.h',
3270 'browser/ui/omnibox/omnibox_edit_model.cc', 3269 'browser/ui/omnibox/omnibox_edit_model.cc',
3271 'browser/ui/omnibox/omnibox_edit_model.h', 3270 'browser/ui/omnibox/omnibox_edit_model.h',
(...skipping 193 matching lines...) Expand 10 before | Expand all | Expand 10 after
3465 'browser/ui/toolbar/toolbar_model_delegate.h', 3464 'browser/ui/toolbar/toolbar_model_delegate.h',
3466 'browser/ui/toolbar/wrench_menu_model.cc', 3465 'browser/ui/toolbar/wrench_menu_model.cc',
3467 'browser/ui/toolbar/wrench_menu_model.h', 3466 'browser/ui/toolbar/wrench_menu_model.h',
3468 'browser/ui/uma_browsing_activity_observer.cc', 3467 'browser/ui/uma_browsing_activity_observer.cc',
3469 'browser/ui/uma_browsing_activity_observer.h', 3468 'browser/ui/uma_browsing_activity_observer.h',
3470 'browser/ui/uninstall_browser_prompt.h', 3469 'browser/ui/uninstall_browser_prompt.h',
3471 'browser/ui/unload_controller.cc', 3470 'browser/ui/unload_controller.cc',
3472 'browser/ui/unload_controller.h', 3471 'browser/ui/unload_controller.h',
3473 'browser/ui/user_data_dir_dialog.h', 3472 'browser/ui/user_data_dir_dialog.h',
3474 'browser/ui/view_ids.h', 3473 'browser/ui/view_ids.h',
3474 'browser/ui/views/about_chrome_view.cc',
3475 'browser/ui/views/about_chrome_view.h',
3475 'browser/ui/views/about_ipc_dialog.cc', 3476 'browser/ui/views/about_ipc_dialog.cc',
3476 'browser/ui/views/about_ipc_dialog.h', 3477 'browser/ui/views/about_ipc_dialog.h',
3477 'browser/ui/views/accelerator_table.cc', 3478 'browser/ui/views/accelerator_table.cc',
3478 'browser/ui/views/accelerator_table.h', 3479 'browser/ui/views/accelerator_table.h',
3479 'browser/ui/views/accessibility/accessibility_event_router_views.cc', 3480 'browser/ui/views/accessibility/accessibility_event_router_views.cc',
3480 'browser/ui/views/accessibility/accessibility_event_router_views.h', 3481 'browser/ui/views/accessibility/accessibility_event_router_views.h',
3481 'browser/ui/views/accessibility/invert_bubble_view.cc', 3482 'browser/ui/views/accessibility/invert_bubble_view.cc',
3482 'browser/ui/views/accessibility/invert_bubble_view.h', 3483 'browser/ui/views/accessibility/invert_bubble_view.h',
3483 'browser/ui/views/app_menu_button_win.cc', 3484 'browser/ui/views/app_menu_button_win.cc',
3484 'browser/ui/views/app_menu_button_win.h', 3485 'browser/ui/views/app_menu_button_win.h',
(...skipping 219 matching lines...) Expand 10 before | Expand all | Expand 10 after
3704 'browser/ui/views/infobars/link_infobar.cc', 3705 'browser/ui/views/infobars/link_infobar.cc',
3705 'browser/ui/views/infobars/link_infobar.h', 3706 'browser/ui/views/infobars/link_infobar.h',
3706 'browser/ui/views/infobars/media_stream_infobar.cc', 3707 'browser/ui/views/infobars/media_stream_infobar.cc',
3707 'browser/ui/views/infobars/media_stream_infobar.h', 3708 'browser/ui/views/infobars/media_stream_infobar.h',
3708 'browser/ui/views/infobars/translate_infobar_base.cc', 3709 'browser/ui/views/infobars/translate_infobar_base.cc',
3709 'browser/ui/views/infobars/translate_infobar_base.h', 3710 'browser/ui/views/infobars/translate_infobar_base.h',
3710 'browser/ui/views/infobars/translate_message_infobar.cc', 3711 'browser/ui/views/infobars/translate_message_infobar.cc',
3711 'browser/ui/views/infobars/translate_message_infobar.h', 3712 'browser/ui/views/infobars/translate_message_infobar.h',
3712 'browser/ui/views/javascript_app_modal_dialog_views.cc', 3713 'browser/ui/views/javascript_app_modal_dialog_views.cc',
3713 'browser/ui/views/javascript_app_modal_dialog_views.h', 3714 'browser/ui/views/javascript_app_modal_dialog_views.h',
3715 'browser/ui/views/keyboard_overlay_delegate.cc',
3716 'browser/ui/views/keyboard_overlay_delegate.h',
3717 'browser/ui/views/keyboard_overlay_dialog_view.cc',
3718 'browser/ui/views/keyboard_overlay_dialog_view.h',
3714 'browser/ui/views/location_bar/action_box_button_view.cc', 3719 'browser/ui/views/location_bar/action_box_button_view.cc',
3715 'browser/ui/views/location_bar/action_box_button_view.h', 3720 'browser/ui/views/location_bar/action_box_button_view.h',
3716 'browser/ui/views/location_bar/chrome_to_mobile_view.cc', 3721 'browser/ui/views/location_bar/chrome_to_mobile_view.cc',
3717 'browser/ui/views/location_bar/chrome_to_mobile_view.h', 3722 'browser/ui/views/location_bar/chrome_to_mobile_view.h',
3718 'browser/ui/views/location_bar/content_setting_image_view.cc', 3723 'browser/ui/views/location_bar/content_setting_image_view.cc',
3719 'browser/ui/views/location_bar/content_setting_image_view.h', 3724 'browser/ui/views/location_bar/content_setting_image_view.h',
3720 'browser/ui/views/location_bar/ev_bubble_view.cc', 3725 'browser/ui/views/location_bar/ev_bubble_view.cc',
3721 'browser/ui/views/location_bar/ev_bubble_view.h', 3726 'browser/ui/views/location_bar/ev_bubble_view.h',
3722 'browser/ui/views/location_bar/icon_label_bubble_view.cc', 3727 'browser/ui/views/location_bar/icon_label_bubble_view.cc',
3723 'browser/ui/views/location_bar/icon_label_bubble_view.h', 3728 'browser/ui/views/location_bar/icon_label_bubble_view.h',
3724 'browser/ui/views/location_bar/keyword_hint_view.cc', 3729 'browser/ui/views/location_bar/keyword_hint_view.cc',
3725 'browser/ui/views/location_bar/keyword_hint_view.h', 3730 'browser/ui/views/location_bar/keyword_hint_view.h',
3726 'browser/ui/views/location_bar/location_bar_container.cc', 3731 'browser/ui/views/location_bar/location_bar_container.cc',
3727 'browser/ui/views/location_bar/location_bar_container.h', 3732 'browser/ui/views/location_bar/location_bar_container.h',
3728 'browser/ui/views/location_bar/location_bar_container_aura.cc', 3733 'browser/ui/views/location_bar/location_bar_container_aura.cc',
3729 'browser/ui/views/location_bar/location_bar_container_win.cc', 3734 'browser/ui/views/location_bar/location_bar_container_win.cc',
3730 'browser/ui/views/location_bar/location_bar_view.cc', 3735 'browser/ui/views/location_bar/location_bar_view.cc',
3731 'browser/ui/views/location_bar/location_bar_view.h', 3736 'browser/ui/views/location_bar/location_bar_view.h',
3732 'browser/ui/views/location_bar/location_icon_view.cc', 3737 'browser/ui/views/location_bar/location_icon_view.cc',
3733 'browser/ui/views/location_bar/location_icon_view.h', 3738 'browser/ui/views/location_bar/location_icon_view.h',
3734 'browser/ui/views/location_bar/metro_pin_view.cc',
3735 'browser/ui/views/location_bar/metro_pin_view.h',
3736 'browser/ui/views/location_bar/page_action_image_view.cc', 3739 'browser/ui/views/location_bar/page_action_image_view.cc',
3737 'browser/ui/views/location_bar/page_action_image_view.h', 3740 'browser/ui/views/location_bar/page_action_image_view.h',
3738 'browser/ui/views/location_bar/page_action_with_badge_view.cc', 3741 'browser/ui/views/location_bar/page_action_with_badge_view.cc',
3739 'browser/ui/views/location_bar/page_action_with_badge_view.h', 3742 'browser/ui/views/location_bar/page_action_with_badge_view.h',
3740 'browser/ui/views/location_bar/page_info_helper.cc', 3743 'browser/ui/views/location_bar/page_info_helper.cc',
3741 'browser/ui/views/location_bar/page_info_helper.h', 3744 'browser/ui/views/location_bar/page_info_helper.h',
3742 'browser/ui/views/location_bar/selected_keyword_view.cc', 3745 'browser/ui/views/location_bar/selected_keyword_view.cc',
3743 'browser/ui/views/location_bar/selected_keyword_view.h', 3746 'browser/ui/views/location_bar/selected_keyword_view.h',
3744 'browser/ui/views/location_bar/star_view.cc', 3747 'browser/ui/views/location_bar/star_view.cc',
3745 'browser/ui/views/location_bar/star_view.h', 3748 'browser/ui/views/location_bar/star_view.h',
(...skipping 390 matching lines...) Expand 10 before | Expand all | Expand 10 after
4136 'browser/ui/webui/options2/options_ui.cc', 4139 'browser/ui/webui/options2/options_ui.cc',
4137 'browser/ui/webui/options2/options_ui.h', 4140 'browser/ui/webui/options2/options_ui.h',
4138 'browser/ui/webui/options2/password_manager_handler.cc', 4141 'browser/ui/webui/options2/password_manager_handler.cc',
4139 'browser/ui/webui/options2/password_manager_handler.h', 4142 'browser/ui/webui/options2/password_manager_handler.h',
4140 'browser/ui/webui/options2/search_engine_manager_handler.cc', 4143 'browser/ui/webui/options2/search_engine_manager_handler.cc',
4141 'browser/ui/webui/options2/search_engine_manager_handler.h', 4144 'browser/ui/webui/options2/search_engine_manager_handler.h',
4142 'browser/ui/webui/options2/startup_pages_handler.cc', 4145 'browser/ui/webui/options2/startup_pages_handler.cc',
4143 'browser/ui/webui/options2/startup_pages_handler.h', 4146 'browser/ui/webui/options2/startup_pages_handler.h',
4144 'browser/ui/webui/options2/web_intents_settings_handler.cc', 4147 'browser/ui/webui/options2/web_intents_settings_handler.cc',
4145 'browser/ui/webui/options2/web_intents_settings_handler.h', 4148 'browser/ui/webui/options2/web_intents_settings_handler.h',
4149 'browser/ui/webui/performance_monitor/web_ui.cc',
4150 'browser/ui/webui/performance_monitor/web_ui.h',
4146 'browser/ui/webui/performance_monitor/web_ui_handler.cc', 4151 'browser/ui/webui/performance_monitor/web_ui_handler.cc',
4147 'browser/ui/webui/performance_monitor/web_ui_handler.h', 4152 'browser/ui/webui/performance_monitor/web_ui_handler.h',
4148 'browser/ui/webui/plugins_ui.cc', 4153 'browser/ui/webui/plugins_ui.cc',
4149 'browser/ui/webui/plugins_ui.h', 4154 'browser/ui/webui/plugins_ui.h',
4150 'browser/ui/webui/policy_ui.cc', 4155 'browser/ui/webui/policy_ui.cc',
4151 'browser/ui/webui/policy_ui.h', 4156 'browser/ui/webui/policy_ui.h',
4152 'browser/ui/webui/predictors/predictors_handler.cc', 4157 'browser/ui/webui/predictors/predictors_handler.cc',
4153 'browser/ui/webui/predictors/predictors_handler.h', 4158 'browser/ui/webui/predictors/predictors_handler.h',
4154 'browser/ui/webui/predictors/predictors_ui.cc', 4159 'browser/ui/webui/predictors/predictors_ui.cc',
4155 'browser/ui/webui/predictors/predictors_ui.h', 4160 'browser/ui/webui/predictors/predictors_ui.h',
(...skipping 176 matching lines...) Expand 10 before | Expand all | Expand 10 after
4332 'browser/accessibility/accessibility_extension_api.cc', 4337 'browser/accessibility/accessibility_extension_api.cc',
4333 'browser/accessibility/accessibility_extension_api.h', 4338 'browser/accessibility/accessibility_extension_api.h',
4334 'browser/bookmarks/bookmark_extension_api.cc', 4339 'browser/bookmarks/bookmark_extension_api.cc',
4335 'browser/bookmarks/bookmark_extension_api.h', 4340 'browser/bookmarks/bookmark_extension_api.h',
4336 'browser/chromeos/extensions/echo_private_api.cc', 4341 'browser/chromeos/extensions/echo_private_api.cc',
4337 'browser/chromeos/extensions/echo_private_api.h', 4342 'browser/chromeos/extensions/echo_private_api.h',
4338 'browser/chromeos/extensions/file_browser_handler_api.cc', 4343 'browser/chromeos/extensions/file_browser_handler_api.cc',
4339 'browser/chromeos/extensions/file_browser_handler_api.h', 4344 'browser/chromeos/extensions/file_browser_handler_api.h',
4340 'browser/chromeos/extensions/file_browser_private_api.cc', 4345 'browser/chromeos/extensions/file_browser_private_api.cc',
4341 'browser/chromeos/extensions/file_browser_private_api.h', 4346 'browser/chromeos/extensions/file_browser_private_api.h',
4342 'browser/chromeos/extensions/wallpaper_manager_util.cc', 4347 'browser/chromeos/extensions/wallpaper_manager_api.cc',
4343 'browser/chromeos/extensions/wallpaper_manager_util.h', 4348 'browser/chromeos/extensions/wallpaper_manager_api.h',
4344 'browser/chromeos/extensions/wallpaper_private_api.cc',
4345 'browser/chromeos/extensions/wallpaper_private_api.h',
4346 'browser/chromeos/media/media_player_extension_api.cc', 4349 'browser/chromeos/media/media_player_extension_api.cc',
4347 'browser/chromeos/media/media_player_extension_api.h', 4350 'browser/chromeos/media/media_player_extension_api.h',
4348 'browser/history/history_extension_api.cc', 4351 'browser/history/history_extension_api.cc',
4349 'browser/history/history_extension_api.h', 4352 'browser/history/history_extension_api.h',
4350 'browser/history/top_sites_extension_api.cc', 4353 'browser/history/top_sites_extension_api.cc',
4351 'browser/history/top_sites_extension_api.h', 4354 'browser/history/top_sites_extension_api.h',
4352 'browser/infobars/infobar_extension_api.cc', 4355 'browser/infobars/infobar_extension_api.cc',
4353 'browser/infobars/infobar_extension_api.h', 4356 'browser/infobars/infobar_extension_api.h',
4354 'browser/rlz/rlz_extension_api.cc', 4357 'browser/rlz/rlz_extension_api.cc',
4355 'browser/rlz/rlz_extension_api.h', 4358 'browser/rlz/rlz_extension_api.h',
(...skipping 803 matching lines...) Expand 10 before | Expand all | Expand 10 after
5159 'sources!': [ 5162 'sources!': [
5160 'browser/history/history_publisher_none.cc', 5163 'browser/history/history_publisher_none.cc',
5161 'browser/importer/nss_decryptor_system_nss.cc', 5164 'browser/importer/nss_decryptor_system_nss.cc',
5162 'browser/importer/nss_decryptor_system_nss.h', 5165 'browser/importer/nss_decryptor_system_nss.h',
5163 'browser/lifetime/application_lifetime_stub.cc', 5166 'browser/lifetime/application_lifetime_stub.cc',
5164 'browser/ui/certificate_dialogs.cc', 5167 'browser/ui/certificate_dialogs.cc',
5165 'browser/ui/certificate_dialogs.h', 5168 'browser/ui/certificate_dialogs.h',
5166 'browser/ui/crypto_module_password_dialog.cc', 5169 'browser/ui/crypto_module_password_dialog.cc',
5167 'browser/ui/crypto_module_password_dialog_nss.cc', 5170 'browser/ui/crypto_module_password_dialog_nss.cc',
5168 'browser/ui/startup/autolaunch_prompt.cc', 5171 'browser/ui/startup/autolaunch_prompt.cc',
5172 'browser/ui/views/keyboard_overlay_delegate.cc',
5173 'browser/ui/views/keyboard_overlay_dialog_view.cc',
5169 'browser/ui/views/simple_message_box_views.cc', 5174 'browser/ui/views/simple_message_box_views.cc',
5170 'browser/ui/webui/help/version_updater_basic.cc', 5175 'browser/ui/webui/help/version_updater_basic.cc',
5171 'browser/ui/webui/help/version_updater_basic.h', 5176 'browser/ui/webui/help/version_updater_basic.h',
5172 'browser/ui/webui/tab_modal_confirm_dialog_webui.cc', 5177 'browser/ui/webui/tab_modal_confirm_dialog_webui.cc',
5173 'browser/ui/webui/tab_modal_confirm_dialog_webui.h', 5178 'browser/ui/webui/tab_modal_confirm_dialog_webui.h',
5174 ], 5179 ],
5175 'conditions': [ 5180 'conditions': [
5176 ['win_use_allocator_shim==1', { 5181 ['win_use_allocator_shim==1', {
5177 'dependencies': [ 5182 'dependencies': [
5178 '<(allocator_target)', 5183 '<(allocator_target)',
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
5235 ['exclude', '^browser/ui/views/'], 5240 ['exclude', '^browser/ui/views/'],
5236 ['exclude', '^browser/ui/webui/tab_modal_confirm_dialog_webui.cc '], 5241 ['exclude', '^browser/ui/webui/tab_modal_confirm_dialog_webui.cc '],
5237 ['exclude', '^browser/ui/webui/tab_modal_confirm_dialog_webui.h' ] 5242 ['exclude', '^browser/ui/webui/tab_modal_confirm_dialog_webui.h' ]
5238 ] 5243 ]
5239 }], 5244 }],
5240 # Build Aura on desktop linux 5245 # Build Aura on desktop linux
5241 ['OS=="linux" and use_aura==1 and chromeos==0', { 5246 ['OS=="linux" and use_aura==1 and chromeos==0', {
5242 'sources/': [ 5247 'sources/': [
5243 ['exclude', '^browser/chromeos/extensions/file_browser_handler_a pi'], 5248 ['exclude', '^browser/chromeos/extensions/file_browser_handler_a pi'],
5244 ['exclude', '^browser/chromeos/extensions/file_browser_private_a pi'], 5249 ['exclude', '^browser/chromeos/extensions/file_browser_private_a pi'],
5250 ['exclude', '^browser/ui/views/keyboard_overlay_delegate.cc'],
5251 ['exclude', '^browser/ui/views/keyboard_overlay_delegate.h'],
5252 ['exclude', '^browser/ui/views/keyboard_overlay_dialog_view.cc'] ,
5253 ['exclude', '^browser/ui/views/keyboard_overlay_dialog_view.h'],
5245 ], 5254 ],
5246 }], 5255 }],
5247 # GTK build only 5256 # GTK build only
5248 ['toolkit_uses_gtk==1', { 5257 ['toolkit_uses_gtk==1', {
5249 'sources/': [ 5258 'sources/': [
5250 ['exclude', '^browser/bookmarks/bookmark_drop_info.cc'], 5259 ['exclude', '^browser/bookmarks/bookmark_drop_info.cc'],
5251 ['exclude', '^browser/lifetime/application_lifetime_stub.cc'], 5260 ['exclude', '^browser/lifetime/application_lifetime_stub.cc'],
5252 ['exclude', '^browser/ui/panels/panel_browser_frame_view.cc'], 5261 ['exclude', '^browser/ui/panels/panel_browser_frame_view.cc'],
5253 ['exclude', '^browser/ui/panels/panel_browser_frame_view.h'], 5262 ['exclude', '^browser/ui/panels/panel_browser_frame_view.h'],
5254 ['exclude', '^browser/ui/panels/panel_browser_view.cc'], 5263 ['exclude', '^browser/ui/panels/panel_browser_view.cc'],
(...skipping 204 matching lines...) Expand 10 before | Expand all | Expand 10 after
5459 'variables': { 5468 'variables': {
5460 'jni_gen_dir': 'chrome', 5469 'jni_gen_dir': 'chrome',
5461 }, 5470 },
5462 'includes': [ '../build/jni_generator.gypi' ], 5471 'includes': [ '../build/jni_generator.gypi' ],
5463 }, 5472 },
5464 ], 5473 ],
5465 }, 5474 },
5466 ], 5475 ],
5467 ], 5476 ],
5468 } 5477 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698