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

Side by Side Diff: chrome/chrome_browser_ui.gypi

Issue 1003323005: Fix ODR violation for ShowTaskManager() on Mac (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « chrome/browser/ui/BUILD.gn ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright 2012 The Chromium Authors. All rights reserved. 1 # Copyright 2012 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 { 5 {
6 'variables': { 6 'variables': {
7 # There are two sections of sources: 7 # There are two sections of sources:
8 # * "Platform"-based sources (OS, toolkit, etc.) 8 # * "Platform"-based sources (OS, toolkit, etc.)
9 # * Feature/directory-based sources (e.g., history, printing) 9 # * Feature/directory-based sources (e.g., history, printing)
10 10
(...skipping 699 matching lines...) Expand 10 before | Expand all | Expand 10 after
710 'browser/ui/cocoa/tabs/tab_strip_drag_controller.h', 710 'browser/ui/cocoa/tabs/tab_strip_drag_controller.h',
711 'browser/ui/cocoa/tabs/tab_strip_drag_controller.mm', 711 'browser/ui/cocoa/tabs/tab_strip_drag_controller.mm',
712 'browser/ui/cocoa/tabs/tab_strip_model_observer_bridge.h', 712 'browser/ui/cocoa/tabs/tab_strip_model_observer_bridge.h',
713 'browser/ui/cocoa/tabs/tab_strip_model_observer_bridge.mm', 713 'browser/ui/cocoa/tabs/tab_strip_model_observer_bridge.mm',
714 'browser/ui/cocoa/tabs/tab_strip_view.h', 714 'browser/ui/cocoa/tabs/tab_strip_view.h',
715 'browser/ui/cocoa/tabs/tab_strip_view.mm', 715 'browser/ui/cocoa/tabs/tab_strip_view.mm',
716 'browser/ui/cocoa/tabs/tab_view.h', 716 'browser/ui/cocoa/tabs/tab_view.h',
717 'browser/ui/cocoa/tabs/tab_view.mm', 717 'browser/ui/cocoa/tabs/tab_view.mm',
718 'browser/ui/cocoa/tabs/tab_window_controller.h', 718 'browser/ui/cocoa/tabs/tab_window_controller.h',
719 'browser/ui/cocoa/tabs/tab_window_controller.mm', 719 'browser/ui/cocoa/tabs/tab_window_controller.mm',
720 'browser/ui/cocoa/task_manager_mac.h',
721 'browser/ui/cocoa/task_manager_mac.mm',
720 'browser/ui/cocoa/themed_window.h', 722 'browser/ui/cocoa/themed_window.h',
721 'browser/ui/cocoa/themed_window.mm', 723 'browser/ui/cocoa/themed_window.mm',
722 'browser/ui/cocoa/toolbar/back_forward_menu_controller.h', 724 'browser/ui/cocoa/toolbar/back_forward_menu_controller.h',
723 'browser/ui/cocoa/toolbar/back_forward_menu_controller.mm', 725 'browser/ui/cocoa/toolbar/back_forward_menu_controller.mm',
724 'browser/ui/cocoa/toolbar/reload_button_cocoa.h', 726 'browser/ui/cocoa/toolbar/reload_button_cocoa.h',
725 'browser/ui/cocoa/toolbar/reload_button_cocoa.mm', 727 'browser/ui/cocoa/toolbar/reload_button_cocoa.mm',
726 'browser/ui/cocoa/toolbar/toolbar_button_cocoa.h', 728 'browser/ui/cocoa/toolbar/toolbar_button_cocoa.h',
727 'browser/ui/cocoa/toolbar/toolbar_button_cocoa.mm', 729 'browser/ui/cocoa/toolbar/toolbar_button_cocoa.mm',
728 'browser/ui/cocoa/toolbar/toolbar_controller.h', 730 'browser/ui/cocoa/toolbar/toolbar_controller.h',
729 'browser/ui/cocoa/toolbar/toolbar_controller.mm', 731 'browser/ui/cocoa/toolbar/toolbar_controller.mm',
(...skipping 1554 matching lines...) Expand 10 before | Expand all | Expand 10 after
2284 'browser/ui/views/tabs/tab_controller.h', 2286 'browser/ui/views/tabs/tab_controller.h',
2285 'browser/ui/views/tabs/tab_drag_controller.cc', 2287 'browser/ui/views/tabs/tab_drag_controller.cc',
2286 'browser/ui/views/tabs/tab_drag_controller.h', 2288 'browser/ui/views/tabs/tab_drag_controller.h',
2287 'browser/ui/views/tabs/tab_strip.cc', 2289 'browser/ui/views/tabs/tab_strip.cc',
2288 'browser/ui/views/tabs/tab_strip.h', 2290 'browser/ui/views/tabs/tab_strip.h',
2289 'browser/ui/views/tabs/tab_strip_controller.h', 2291 'browser/ui/views/tabs/tab_strip_controller.h',
2290 'browser/ui/views/tabs/window_finder.h', 2292 'browser/ui/views/tabs/window_finder.h',
2291 'browser/ui/views/tabs/window_finder_chromeos.cc', 2293 'browser/ui/views/tabs/window_finder_chromeos.cc',
2292 'browser/ui/views/tabs/window_finder_mac.mm', 2294 'browser/ui/views/tabs/window_finder_mac.mm',
2293 'browser/ui/views/tabs/window_finder_win.cc', 2295 'browser/ui/views/tabs/window_finder_win.cc',
2296 'browser/ui/views/task_manager_view.cc',
2294 'browser/ui/views/theme_image_mapper.cc', 2297 'browser/ui/views/theme_image_mapper.cc',
2295 'browser/ui/views/theme_image_mapper.h', 2298 'browser/ui/views/theme_image_mapper.h',
2296 'browser/ui/views/toolbar/back_button.cc', 2299 'browser/ui/views/toolbar/back_button.cc',
2297 'browser/ui/views/toolbar/back_button.h', 2300 'browser/ui/views/toolbar/back_button.h',
2298 'browser/ui/views/toolbar/browser_action_test_util_views.cc', 2301 'browser/ui/views/toolbar/browser_action_test_util_views.cc',
2299 'browser/ui/views/toolbar/browser_actions_container.cc', 2302 'browser/ui/views/toolbar/browser_actions_container.cc',
2300 'browser/ui/views/toolbar/browser_actions_container.h', 2303 'browser/ui/views/toolbar/browser_actions_container.h',
2301 'browser/ui/views/toolbar/browser_actions_container_observer.h', 2304 'browser/ui/views/toolbar/browser_actions_container_observer.h',
2302 'browser/ui/views/toolbar/chevron_menu_button.cc', 2305 'browser/ui/views/toolbar/chevron_menu_button.cc',
2303 'browser/ui/views/toolbar/chevron_menu_button.h', 2306 'browser/ui/views/toolbar/chevron_menu_button.h',
(...skipping 351 matching lines...) Expand 10 before | Expand all | Expand 10 after
2655 'browser/ui/webui/print_preview/sticky_settings.cc', 2658 'browser/ui/webui/print_preview/sticky_settings.cc',
2656 'browser/ui/webui/print_preview/sticky_settings.h', 2659 'browser/ui/webui/print_preview/sticky_settings.h',
2657 ], 2660 ],
2658 # For when enable_service_discovery is set. 2661 # For when enable_service_discovery is set.
2659 'chrome_browser_ui_service_discovery_sources': [ 2662 'chrome_browser_ui_service_discovery_sources': [
2660 'browser/ui/webui/local_discovery/local_discovery_ui.cc', 2663 'browser/ui/webui/local_discovery/local_discovery_ui.cc',
2661 'browser/ui/webui/local_discovery/local_discovery_ui.h', 2664 'browser/ui/webui/local_discovery/local_discovery_ui.h',
2662 'browser/ui/webui/local_discovery/local_discovery_ui_handler.cc', 2665 'browser/ui/webui/local_discovery/local_discovery_ui_handler.cc',
2663 'browser/ui/webui/local_discovery/local_discovery_ui_handler.h', 2666 'browser/ui/webui/local_discovery/local_discovery_ui_handler.h',
2664 ], 2667 ],
2665 'chrome_browser_ui_task_manager_sources': [
2666 'browser/ui/cocoa/task_manager_mac.h',
2667 'browser/ui/cocoa/task_manager_mac.mm',
2668 'browser/ui/views/task_manager_view.cc',
2669 ],
2670 'chrome_browser_ui_toolbar_model_sources': [ 2668 'chrome_browser_ui_toolbar_model_sources': [
2671 'browser/ui/android/toolbar/toolbar_model_android.cc', 2669 'browser/ui/android/toolbar/toolbar_model_android.cc',
2672 'browser/ui/android/toolbar/toolbar_model_android.h', 2670 'browser/ui/android/toolbar/toolbar_model_android.h',
2673 'browser/ui/toolbar/toolbar_model.cc', 2671 'browser/ui/toolbar/toolbar_model.cc',
2674 'browser/ui/toolbar/toolbar_model.h', 2672 'browser/ui/toolbar/toolbar_model.h',
2675 'browser/ui/toolbar/toolbar_model_delegate.h', 2673 'browser/ui/toolbar/toolbar_model_delegate.h',
2676 'browser/ui/toolbar/toolbar_model_impl.cc', 2674 'browser/ui/toolbar/toolbar_model_impl.cc',
2677 'browser/ui/toolbar/toolbar_model_impl.h', 2675 'browser/ui/toolbar/toolbar_model_impl.h',
2678 'browser/ui/toolbar/toolbar_model_security_level_list.h', 2676 'browser/ui/toolbar/toolbar_model_security_level_list.h',
2679 ], 2677 ],
(...skipping 120 matching lines...) Expand 10 before | Expand all | Expand 10 after
2800 ], 2798 ],
2801 }], 2799 }],
2802 ['enable_basic_printing==1 or enable_print_preview==1', { 2800 ['enable_basic_printing==1 or enable_print_preview==1', {
2803 'dependencies': [ 2801 'dependencies': [
2804 '../printing/printing.gyp:printing', 2802 '../printing/printing.gyp:printing',
2805 ], 2803 ],
2806 }], 2804 }],
2807 ['enable_one_click_signin==1', { 2805 ['enable_one_click_signin==1', {
2808 'sources': [ '<@(chrome_browser_ui_one_click_signin_sources)' ] 2806 'sources': [ '<@(chrome_browser_ui_one_click_signin_sources)' ]
2809 }], 2807 }],
2810 ['enable_task_manager==1', {
2811 'sources': [ '<@(chrome_browser_ui_task_manager_sources)' ],
2812 }],
2813 ['disable_nacl==0', { 2808 ['disable_nacl==0', {
2814 'sources': [ '<@(chrome_browser_ui_nacl_sources)' ], 2809 'sources': [ '<@(chrome_browser_ui_nacl_sources)' ],
2815 'dependencies': [ 2810 'dependencies': [
2816 '../native_client/src/trusted/service_runtime/service_runtime.gyp:se l', 2811 '../native_client/src/trusted/service_runtime/service_runtime.gyp:se l',
2817 ], 2812 ],
2818 }], 2813 }],
2819 ['debug_devtools==1', { 2814 ['debug_devtools==1', {
2820 'defines': [ 2815 'defines': [
2821 'DEBUG_DEVTOOLS=1', 2816 'DEBUG_DEVTOOLS=1',
2822 ], 2817 ],
(...skipping 363 matching lines...) Expand 10 before | Expand all | Expand 10 after
3186 ], 3181 ],
3187 'sources': [ 3182 'sources': [
3188 '<@(chrome_browser_ui_non_mobile_sources)', 3183 '<@(chrome_browser_ui_non_mobile_sources)',
3189 '<@(chrome_browser_ui_omnibox_non_mobile_sources)', 3184 '<@(chrome_browser_ui_omnibox_non_mobile_sources)',
3190 ], 3185 ],
3191 }], 3186 }],
3192 ], 3187 ],
3193 }, 3188 },
3194 ], 3189 ],
3195 } 3190 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/BUILD.gn ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698