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

Unified 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/ui/BUILD.gn ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/chrome_browser_ui.gypi
diff --git a/chrome/chrome_browser_ui.gypi b/chrome/chrome_browser_ui.gypi
index 6eafb63f8fd365037d3ed5021fdcc809ff1fba5a..96a52ce8f8b153f81321699773934d94dde879e7 100644
--- a/chrome/chrome_browser_ui.gypi
+++ b/chrome/chrome_browser_ui.gypi
@@ -717,6 +717,8 @@
'browser/ui/cocoa/tabs/tab_view.mm',
'browser/ui/cocoa/tabs/tab_window_controller.h',
'browser/ui/cocoa/tabs/tab_window_controller.mm',
+ 'browser/ui/cocoa/task_manager_mac.h',
+ 'browser/ui/cocoa/task_manager_mac.mm',
'browser/ui/cocoa/themed_window.h',
'browser/ui/cocoa/themed_window.mm',
'browser/ui/cocoa/toolbar/back_forward_menu_controller.h',
@@ -2291,6 +2293,7 @@
'browser/ui/views/tabs/window_finder_chromeos.cc',
'browser/ui/views/tabs/window_finder_mac.mm',
'browser/ui/views/tabs/window_finder_win.cc',
+ 'browser/ui/views/task_manager_view.cc',
'browser/ui/views/theme_image_mapper.cc',
'browser/ui/views/theme_image_mapper.h',
'browser/ui/views/toolbar/back_button.cc',
@@ -2662,11 +2665,6 @@
'browser/ui/webui/local_discovery/local_discovery_ui_handler.cc',
'browser/ui/webui/local_discovery/local_discovery_ui_handler.h',
],
- 'chrome_browser_ui_task_manager_sources': [
- 'browser/ui/cocoa/task_manager_mac.h',
- 'browser/ui/cocoa/task_manager_mac.mm',
- 'browser/ui/views/task_manager_view.cc',
- ],
'chrome_browser_ui_toolbar_model_sources': [
'browser/ui/android/toolbar/toolbar_model_android.cc',
'browser/ui/android/toolbar/toolbar_model_android.h',
@@ -2807,9 +2805,6 @@
['enable_one_click_signin==1', {
'sources': [ '<@(chrome_browser_ui_one_click_signin_sources)' ]
}],
- ['enable_task_manager==1', {
- 'sources': [ '<@(chrome_browser_ui_task_manager_sources)' ],
- }],
['disable_nacl==0', {
'sources': [ '<@(chrome_browser_ui_nacl_sources)' ],
'dependencies': [
« 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