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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/chrome_browser_ui.gypi

Issue 375843002: MacViews: Initial chrome_browser_ui.gypi support for views on mac (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: remove taskmanager changes: framework 78480k, resources 45232k Created 6 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 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 a194db48b9dd410a49b80c7a5b87db675472f22e..a02f9e2ef5d8f5a9cf7054cb3e70804fcd1b4837 100644
--- a/chrome/chrome_browser_ui.gypi
+++ b/chrome/chrome_browser_ui.gypi
@@ -703,8 +703,6 @@
'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',
@@ -1829,9 +1827,9 @@
'browser/ui/views/sync/one_click_signin_bubble_view.h',
],
'chrome_browser_ui_task_manager_sources': [
- 'browser/ui/views/task_manager_view.cc',
'browser/ui/cocoa/task_manager_mac.h',
'browser/ui/cocoa/task_manager_mac.mm',
+ 'browser/ui/views/task_manager_view.cc',
],
'chrome_browser_ui_nacl_sources': [
'browser/ui/webui/nacl_ui.cc',
@@ -1845,17 +1843,9 @@
'browser/ui/webui/policy_ui.cc',
'browser/ui/webui/policy_ui.h',
],
- # Cross-platform views sources. We assume app list is enabled.
- 'chrome_browser_ui_views_sources': [
- 'browser/ui/app_list/app_list_controller_delegate_views.cc',
- 'browser/ui/app_list/app_list_controller_delegate_views.h',
- 'browser/ui/app_list/app_list_service_views.cc',
- 'browser/ui/app_list/app_list_service_views.h',
- 'browser/ui/app_list/app_list_shower_views.cc',
- 'browser/ui/app_list/app_list_shower_views.h',
+ # Cross-platform (except Mac) views sources. We assume app list is enabled.
+ 'chrome_browser_ui_views_non_mac_sources': [
'browser/ui/views/accelerator_utils_aura.cc',
- 'browser/ui/views/accessibility/accessibility_event_router_views.cc',
- 'browser/ui/views/accessibility/accessibility_event_router_views.h',
'browser/ui/views/accessibility/invert_bubble_view.cc',
'browser/ui/views/accessibility/invert_bubble_view.h',
'browser/ui/views/apps/app_info_dialog/app_info_dialog_views.cc',
@@ -1930,11 +1920,8 @@
'browser/ui/views/bookmarks/bookmark_sync_promo_view.cc',
'browser/ui/views/bookmarks/bookmark_sync_promo_view.h',
'browser/ui/views/certificate_viewer_win.cc',
- 'browser/ui/views/chrome_browser_main_extra_parts_views.cc',
- 'browser/ui/views/chrome_browser_main_extra_parts_views.h',
'browser/ui/views/chrome_views_delegate.cc',
'browser/ui/views/chrome_views_delegate_chromeos.cc',
- 'browser/ui/views/chrome_views_delegate.h',
'browser/ui/views/chrome_web_dialog_view.cc',
'browser/ui/views/collected_cookies_views.cc',
'browser/ui/views/collected_cookies_views.h',
@@ -2281,6 +2268,21 @@
'browser/ui/views/website_settings/website_settings_popup_view.cc',
'browser/ui/views/website_settings/website_settings_popup_view.h',
],
+ # Cross-platform views sources also ready for toolkit-views on Mac.
+ 'chrome_browser_ui_views_sources': [
+ 'browser/ui/app_list/app_list_controller_delegate_views.cc',
+ 'browser/ui/app_list/app_list_controller_delegate_views.h',
+ 'browser/ui/app_list/app_list_service_views.cc',
+ 'browser/ui/app_list/app_list_service_views.h',
+ 'browser/ui/app_list/app_list_shower_views.cc',
+ 'browser/ui/app_list/app_list_shower_views.h',
+ 'browser/ui/views/accessibility/accessibility_event_router_views.cc',
+ 'browser/ui/views/accessibility/accessibility_event_router_views.h',
+ 'browser/ui/views/chrome_browser_main_extra_parts_views.cc',
+ 'browser/ui/views/chrome_browser_main_extra_parts_views.h',
+ 'browser/ui/views/chrome_views_delegate.cc',
+ 'browser/ui/views/chrome_views_delegate.h',
+ ],
# Views files for everwhere but ChromeOS.
'chrome_browser_ui_views_non_chromeos_sources': [
'browser/ui/views/chrome_views_delegate_aura.cc',
@@ -2716,12 +2718,15 @@
['toolkit_views==1', {
'sources': [ '<@(chrome_browser_ui_views_sources)' ],
'conditions': [
- ['chromeos == 0', {
+ ['chromeos == 0 and OS!="mac"', {
'sources': [ '<@(chrome_browser_ui_views_non_chromeos_sources)' ],
}],
['use_ash == 1', {
'sources': [ '<@(chrome_browser_ui_ash_views_sources)' ],
}],
+ ['OS!="mac"', {
+ 'sources': [ '<@(chrome_browser_ui_views_non_mac_sources)' ],
+ }],
],
}],
['use_aura==1 and chromeos==0 and use_ozone==0 and OS=="linux"', {
@@ -2799,6 +2804,8 @@
'browser/ui/tabs/tab_resources.h',
'browser/ui/views/extensions/extension_view_views.cc',
'browser/ui/views/extensions/extension_view_views.h',
+ # Task manager has its own sources list. Leave out the views one.
+ 'browser/ui/views/task_manager_view.cc',
],
'dependencies': [
'../third_party/apple_sample_code/apple_sample_code.gyp:apple_sample_code',
@@ -2837,6 +2844,9 @@
],
}, { # non-Mac.
'sources': [ '<@(chrome_browser_ui_non_mac_sources)' ],
+ 'sources/': [
+ ['exclude', '^browser/ui/cocoa/'],
+ ],
}],
['OS=="win"', {
'include_dirs': [
@@ -2866,7 +2876,7 @@
],
}, { # 'OS!="win"
'conditions': [
- ['use_aura==1', {
+ ['toolkit_views==1', {
'dependencies': [
'../ui/views/controls/webview/webview.gyp:webview',
'../ui/views/views.gyp:views',
@@ -2875,10 +2885,7 @@
'<(INTERMEDIATE_DIR)',
'<(INTERMEDIATE_DIR)/chrome',
],
- 'sources/': [
- ['exclude', '^browser/ui/cocoa/*'],
- ],
- }, { # else: use_aura==0
+ }, { # else: toolkit_views==0
'sources/': [
# Exclude all of views.
['exclude', '^browser/ui/views/'],
« 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