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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/chrome_browser_ui.gypi

Issue 987483003: MacViews: gyp change for building MacViews browser. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Update GN 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 eccc1d8baa21b819f711db926ba9fa822dfff551..2adceb429ce285b666555d72659043416ba9f4df 100644
--- a/chrome/chrome_browser_ui.gypi
+++ b/chrome/chrome_browser_ui.gypi
@@ -1283,8 +1283,16 @@
'browser/ui/aura/tab_contents/web_drag_bookmark_handler_aura.h',
'browser/ui/gesture_prefs_observer_factory_aura.cc',
'browser/ui/gesture_prefs_observer_factory_aura.h',
+ 'browser/ui/views/crypto_module_password_dialog_view.cc',
+ 'browser/ui/views/crypto_module_password_dialog_view.h',
+ 'browser/ui/views/desktop_media_picker_views.cc',
+ 'browser/ui/views/desktop_media_picker_views.h',
'browser/ui/views/link_disambiguation/link_disambiguation_popup.cc',
'browser/ui/views/link_disambiguation/link_disambiguation_popup.h',
+ 'browser/ui/views/renderer_context_menu/render_view_context_menu_views.cc',
+ 'browser/ui/views/renderer_context_menu/render_view_context_menu_views.h',
+ 'browser/ui/views/tab_contents/chrome_web_contents_view_delegate_views.cc',
+ 'browser/ui/views/tab_contents/chrome_web_contents_view_delegate_views.h',
'browser/ui/webui/gesture_config_ui.cc',
'browser/ui/webui/gesture_config_ui.h',
'browser/ui/window_sizer/window_sizer_aura.cc',
@@ -1863,78 +1871,6 @@
'browser/ui/views/chrome_constrained_window_views_client.h',
'browser/ui/views/chrome_views_delegate.cc',
'browser/ui/views/chrome_views_delegate.h',
- 'browser/ui/views/collected_cookies_views.cc',
- 'browser/ui/views/collected_cookies_views.h',
- 'browser/ui/views/cookie_info_view.cc',
- 'browser/ui/views/cookie_info_view.h',
- 'browser/ui/views/extensions/extension_keybinding_registry_views.cc',
- 'browser/ui/views/extensions/extension_keybinding_registry_views.h',
- 'browser/ui/views/find_bar_host.cc',
- 'browser/ui/views/find_bar_host.h',
- 'browser/ui/views/find_bar_view.cc',
- 'browser/ui/views/find_bar_view.h',
- 'browser/ui/views/frame/taskbar_decorator.cc',
- 'browser/ui/views/frame/taskbar_decorator.h',
- 'browser/ui/views/hung_renderer_view.cc',
- 'browser/ui/views/hung_renderer_view.h',
- 'browser/ui/views/infobars/confirm_infobar.cc',
- 'browser/ui/views/infobars/confirm_infobar.h',
- 'browser/ui/views/passwords/credentials_item_view.cc',
- 'browser/ui/views/passwords/credentials_item_view.h',
- 'browser/ui/views/passwords/manage_credential_item_view.cc',
- 'browser/ui/views/passwords/manage_credential_item_view.h',
- 'browser/ui/views/passwords/manage_password_items_view.cc',
- 'browser/ui/views/passwords/manage_password_items_view.h',
- 'browser/ui/views/passwords/manage_passwords_bubble_view.cc',
- 'browser/ui/views/passwords/manage_passwords_bubble_view.h',
- 'browser/ui/views/passwords/manage_passwords_icon_view.cc',
- 'browser/ui/views/passwords/manage_passwords_icon_view.h',
- 'browser/ui/views/tab_dialogs_views.cc',
- 'browser/ui/views/tab_dialogs_views.h',
- 'browser/ui/views/tabs/browser_tab_strip_controller.cc',
- 'browser/ui/views/tabs/browser_tab_strip_controller.h',
- 'browser/ui/views/tabs/media_indicator_button.cc',
- 'browser/ui/views/tabs/media_indicator_button.h',
- 'browser/ui/views/tabs/stacked_tab_strip_layout.cc',
- 'browser/ui/views/tabs/stacked_tab_strip_layout.h',
- 'browser/ui/views/tabs/tab.cc',
- 'browser/ui/views/tabs/tab.h',
- 'browser/ui/views/tabs/tab_controller.h',
- 'browser/ui/views/tabs/tab_drag_controller.cc',
- 'browser/ui/views/tabs/tab_drag_controller.h',
- 'browser/ui/views/tabs/tab_strip.cc',
- 'browser/ui/views/tabs/tab_strip.h',
- 'browser/ui/views/tabs/tab_strip_controller.h',
- 'browser/ui/views/tabs/window_finder.h',
- '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/toolbar/back_button.cc',
- 'browser/ui/views/toolbar/back_button.h',
- 'browser/ui/views/toolbar/browser_action_test_util_views.cc',
- 'browser/ui/views/toolbar/browser_actions_container.cc',
- 'browser/ui/views/toolbar/browser_actions_container.h',
- 'browser/ui/views/toolbar/browser_actions_container_observer.h',
- 'browser/ui/views/toolbar/chevron_menu_button.cc',
- 'browser/ui/views/toolbar/chevron_menu_button.h',
- 'browser/ui/views/toolbar/extension_toolbar_menu_view.cc',
- 'browser/ui/views/toolbar/extension_toolbar_menu_view.h',
- 'browser/ui/views/toolbar/home_button.cc',
- 'browser/ui/views/toolbar/home_button.h',
- 'browser/ui/views/toolbar/reload_button.cc',
- 'browser/ui/views/toolbar/reload_button.h',
- 'browser/ui/views/toolbar/toolbar_action_view.cc',
- 'browser/ui/views/toolbar/toolbar_action_view.h',
- 'browser/ui/views/toolbar/toolbar_action_view_delegate_views.h',
- 'browser/ui/views/toolbar/toolbar_button.cc',
- 'browser/ui/views/toolbar/toolbar_button.h',
- 'browser/ui/views/toolbar/toolbar_view.cc',
- 'browser/ui/views/toolbar/toolbar_view.h',
- 'browser/ui/views/toolbar/wrench_menu.cc',
- 'browser/ui/views/toolbar/wrench_menu.h',
- 'browser/ui/views/toolbar/wrench_menu_observer.h',
- 'browser/ui/views/toolbar/wrench_toolbar_button.cc',
- 'browser/ui/views/toolbar/wrench_toolbar_button.h',
],
# Views files for everwhere but ChromeOS.
'chrome_browser_ui_views_non_chromeos_sources': [
@@ -2034,6 +1970,8 @@
'browser/ui/views/chrome_javascript_native_dialog_factory_views.cc',
'browser/ui/views/chrome_views_delegate_chromeos.cc',
'browser/ui/views/chrome_web_dialog_view.cc',
+ 'browser/ui/views/collected_cookies_views.cc',
+ 'browser/ui/views/collected_cookies_views.h',
'browser/ui/views/color_chooser_aura.cc',
'browser/ui/views/color_chooser_aura.h',
'browser/ui/views/color_chooser_win.cc',
@@ -2044,14 +1982,12 @@
'browser/ui/views/constrained_web_dialog_delegate_views.cc',
'browser/ui/views/content_setting_bubble_contents.cc',
'browser/ui/views/content_setting_bubble_contents.h',
+ 'browser/ui/views/cookie_info_view.cc',
+ 'browser/ui/views/cookie_info_view.h',
'browser/ui/views/create_application_shortcut_view.cc',
'browser/ui/views/create_application_shortcut_view.h',
'browser/ui/views/critical_notification_bubble_view.cc',
'browser/ui/views/critical_notification_bubble_view.h',
- 'browser/ui/views/crypto_module_password_dialog_view.cc',
- 'browser/ui/views/crypto_module_password_dialog_view.h',
- 'browser/ui/views/desktop_media_picker_views.cc',
- 'browser/ui/views/desktop_media_picker_views.h',
'browser/ui/views/download/download_danger_prompt_views.cc',
'browser/ui/views/download/download_feedback_dialog_view.cc',
'browser/ui/views/download/download_feedback_dialog_view.h',
@@ -2094,6 +2030,8 @@
'browser/ui/views/extensions/extension_install_dialog_view.cc',
'browser/ui/views/extensions/extension_installed_bubble_view.cc',
'browser/ui/views/extensions/extension_installed_bubble_view.h',
+ 'browser/ui/views/extensions/extension_keybinding_registry_views.cc',
+ 'browser/ui/views/extensions/extension_keybinding_registry_views.h',
'browser/ui/views/extensions/extension_message_bubble_view.cc',
'browser/ui/views/extensions/extension_message_bubble_view.h',
'browser/ui/views/extensions/extension_popup.cc',
@@ -2107,6 +2045,10 @@
'browser/ui/views/extensions/media_galleries_dialog_views.h',
'browser/ui/views/extensions/media_gallery_checkbox_view.cc',
'browser/ui/views/extensions/media_gallery_checkbox_view.h',
+ 'browser/ui/views/find_bar_host.cc',
+ 'browser/ui/views/find_bar_host.h',
+ 'browser/ui/views/find_bar_view.cc',
+ 'browser/ui/views/find_bar_view.h',
'browser/ui/views/first_run_bubble.cc',
'browser/ui/views/first_run_bubble.h',
'browser/ui/views/frame/browser_frame.cc',
@@ -2163,6 +2105,8 @@
'browser/ui/views/frame/system_menu_model_builder.h',
'browser/ui/views/frame/system_menu_model_delegate.cc',
'browser/ui/views/frame/system_menu_model_delegate.h',
+ 'browser/ui/views/frame/taskbar_decorator.cc',
+ 'browser/ui/views/frame/taskbar_decorator.h',
'browser/ui/views/frame/taskbar_decorator_win.cc',
'browser/ui/views/frame/top_container_view.cc',
'browser/ui/views/frame/top_container_view.h',
@@ -2171,10 +2115,14 @@
'browser/ui/views/frame/web_contents_close_handler_delegate.h',
'browser/ui/views/global_error_bubble_view.cc',
'browser/ui/views/global_error_bubble_view.h',
+ 'browser/ui/views/hung_renderer_view.cc',
+ 'browser/ui/views/hung_renderer_view.h',
'browser/ui/views/importer/import_lock_dialog_view.cc',
'browser/ui/views/importer/import_lock_dialog_view.h',
'browser/ui/views/infobars/alternate_nav_infobar_view.cc',
'browser/ui/views/infobars/alternate_nav_infobar_view.h',
+ 'browser/ui/views/infobars/confirm_infobar.cc',
+ 'browser/ui/views/infobars/confirm_infobar.h',
'browser/ui/views/infobars/infobar_background.cc',
'browser/ui/views/infobars/infobar_background.h',
'browser/ui/views/infobars/infobar_container_view.cc',
@@ -2246,6 +2194,16 @@
'browser/ui/views/panels/taskbar_window_thumbnailer_win.h',
'browser/ui/views/panels/x11_panel_resizer.cc',
'browser/ui/views/panels/x11_panel_resizer.h',
+ 'browser/ui/views/passwords/credentials_item_view.cc',
+ 'browser/ui/views/passwords/credentials_item_view.h',
+ 'browser/ui/views/passwords/manage_credential_item_view.cc',
+ 'browser/ui/views/passwords/manage_credential_item_view.h',
+ 'browser/ui/views/passwords/manage_password_items_view.cc',
+ 'browser/ui/views/passwords/manage_password_items_view.h',
+ 'browser/ui/views/passwords/manage_passwords_bubble_view.cc',
+ 'browser/ui/views/passwords/manage_passwords_bubble_view.h',
+ 'browser/ui/views/passwords/manage_passwords_icon_view.cc',
+ 'browser/ui/views/passwords/manage_passwords_icon_view.h',
'browser/ui/views/pdf_password_dialog.cc',
'browser/ui/views/process_singleton_dialog_linux.cc',
'browser/ui/views/profiles/avatar_menu_bubble_view.cc',
@@ -2264,8 +2222,6 @@
'browser/ui/views/profiles/user_manager_view.h',
'browser/ui/views/proximity_auth/proximity_auth_error_bubble_view.cc',
'browser/ui/views/proximity_auth/proximity_auth_error_bubble_view.h',
- 'browser/ui/views/renderer_context_menu/render_view_context_menu_views.cc',
- 'browser/ui/views/renderer_context_menu/render_view_context_menu_views.h',
'browser/ui/views/sad_tab_view.cc',
'browser/ui/views/sad_tab_view.h',
'browser/ui/views/session_crashed_bubble_view.cc',
@@ -2291,14 +2247,58 @@
'browser/ui/views/status_icons/status_tray_win.h',
'browser/ui/views/sync/profile_signin_confirmation_dialog_views.cc',
'browser/ui/views/sync/profile_signin_confirmation_dialog_views.h',
- 'browser/ui/views/tab_contents/chrome_web_contents_view_delegate_views.cc',
- 'browser/ui/views/tab_contents/chrome_web_contents_view_delegate_views.h',
+ 'browser/ui/views/tab_dialogs_views.cc',
+ 'browser/ui/views/tab_dialogs_views.h',
'browser/ui/views/tab_icon_view.cc',
'browser/ui/views/tab_icon_view.h',
'browser/ui/views/tab_modal_confirm_dialog_views.cc',
'browser/ui/views/tab_modal_confirm_dialog_views.h',
+ 'browser/ui/views/tabs/browser_tab_strip_controller.cc',
+ 'browser/ui/views/tabs/browser_tab_strip_controller.h',
+ 'browser/ui/views/tabs/media_indicator_button.cc',
+ 'browser/ui/views/tabs/media_indicator_button.h',
+ 'browser/ui/views/tabs/stacked_tab_strip_layout.cc',
+ 'browser/ui/views/tabs/stacked_tab_strip_layout.h',
+ 'browser/ui/views/tabs/tab.cc',
+ 'browser/ui/views/tabs/tab.h',
+ 'browser/ui/views/tabs/tab_controller.h',
+ 'browser/ui/views/tabs/tab_drag_controller.cc',
+ 'browser/ui/views/tabs/tab_drag_controller.h',
+ 'browser/ui/views/tabs/tab_strip.cc',
+ 'browser/ui/views/tabs/tab_strip.h',
+ 'browser/ui/views/tabs/tab_strip_controller.h',
+ 'browser/ui/views/tabs/window_finder.h',
+ '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/theme_image_mapper.cc',
'browser/ui/views/theme_image_mapper.h',
+ 'browser/ui/views/toolbar/back_button.cc',
+ 'browser/ui/views/toolbar/back_button.h',
+ 'browser/ui/views/toolbar/browser_action_test_util_views.cc',
+ 'browser/ui/views/toolbar/browser_actions_container.cc',
+ 'browser/ui/views/toolbar/browser_actions_container.h',
+ 'browser/ui/views/toolbar/browser_actions_container_observer.h',
+ 'browser/ui/views/toolbar/chevron_menu_button.cc',
+ 'browser/ui/views/toolbar/chevron_menu_button.h',
+ 'browser/ui/views/toolbar/extension_toolbar_menu_view.cc',
+ 'browser/ui/views/toolbar/extension_toolbar_menu_view.h',
+ 'browser/ui/views/toolbar/home_button.cc',
+ 'browser/ui/views/toolbar/home_button.h',
+ 'browser/ui/views/toolbar/reload_button.cc',
+ 'browser/ui/views/toolbar/reload_button.h',
+ 'browser/ui/views/toolbar/toolbar_action_view.cc',
+ 'browser/ui/views/toolbar/toolbar_action_view.h',
+ 'browser/ui/views/toolbar/toolbar_action_view_delegate_views.h',
+ 'browser/ui/views/toolbar/toolbar_button.cc',
+ 'browser/ui/views/toolbar/toolbar_button.h',
+ 'browser/ui/views/toolbar/toolbar_view.cc',
+ 'browser/ui/views/toolbar/toolbar_view.h',
+ 'browser/ui/views/toolbar/wrench_menu.cc',
+ 'browser/ui/views/toolbar/wrench_menu.h',
+ 'browser/ui/views/toolbar/wrench_menu_observer.h',
+ 'browser/ui/views/toolbar/wrench_toolbar_button.cc',
+ 'browser/ui/views/toolbar/wrench_toolbar_button.h',
'browser/ui/views/touch_uma/touch_uma.h',
'browser/ui/views/translate/translate_bubble_view.cc',
'browser/ui/views/translate/translate_bubble_view.h',
@@ -2875,34 +2875,37 @@
['mac_views_browser==1', {
'sources': [
'<@(chrome_browser_ui_views_mac_experimental_sources)',
+ '<@(chrome_browser_ui_views_non_mac_sources)',
],
'sources!': [
'browser/ui/cocoa/apps/chrome_app_window_client_cocoa.mm',
+ 'browser/ui/cocoa/autofill/card_unmask_prompt_view_bridge.mm',
+ 'browser/ui/cocoa/autofill/generated_credit_card_bubble_cocoa.mm',
+ 'browser/ui/cocoa/autofill/new_credit_card_bubble_cocoa.mm',
'browser/ui/cocoa/bookmarks/bookmark_drag_drop_cocoa.mm',
'browser/ui/cocoa/browser_window_factory_cocoa.mm',
+ 'browser/ui/cocoa/constrained_web_dialog_delegate_mac.mm',
+ 'browser/ui/cocoa/extensions/browser_action_test_util_mac.mm',
+ 'browser/ui/cocoa/extensions/extension_action_platform_delegate_cocoa.mm',
+ 'browser/ui/cocoa/extensions/extension_install_dialog_controller.mm',
+ 'browser/ui/cocoa/extensions/extension_installed_bubble_bridge.mm',
+ 'browser/ui/cocoa/extensions/extension_uninstall_dialog_cocoa.mm',
+ 'browser/ui/cocoa/extensions/media_galleries_dialog_cocoa.mm',
+ 'browser/ui/cocoa/infobars/alternate_nav_infobar_controller.mm',
'browser/ui/cocoa/infobars/confirm_infobar_controller.mm',
+ 'browser/ui/cocoa/login_prompt_cocoa.mm',
+ 'browser/ui/cocoa/panels/panel_stack_window_cocoa.mm',
+ 'browser/ui/cocoa/simple_message_box_mac.mm',
+ 'browser/ui/cocoa/single_web_contents_dialog_manager_cocoa.cc',
+ 'browser/ui/cocoa/ssl_client_certificate_selector_cocoa.mm',
'browser/ui/cocoa/tab_dialogs_cocoa.mm',
+ 'browser/ui/cocoa/tab_modal_confirm_dialog_mac.mm',
+ 'browser/ui/cocoa/task_manager_mac.mm',
+ 'browser/ui/cocoa/web_dialog_window_controller.mm',
],
'dependencies': [
'<(DEPTH)/extensions/components/extensions_components.gyp:native_app_window',
],
- }, {
- 'sources!': [
- 'browser/ui/views/apps/chrome_native_app_window_views.cc',
- 'browser/ui/views/apps/chrome_native_app_window_views.h',
- 'browser/ui/views/apps/desktop_keyboard_capture.cc',
- 'browser/ui/views/apps/desktop_keyboard_capture.h',
- 'browser/ui/views/apps/keyboard_hook_handler.cc',
- 'browser/ui/views/apps/keyboard_hook_handler.h',
- 'browser/ui/views/bookmarks/bookmark_drag_drop_views.cc',
- 'browser/ui/views/extensions/extension_keybinding_registry_views.cc',
- 'browser/ui/views/extensions/extension_keybinding_registry_views.h',
- 'browser/ui/views/frame/browser_window_factory.cc',
- 'browser/ui/views/frame/taskbar_decorator.cc',
- 'browser/ui/views/frame/taskbar_decorator.h',
- 'browser/ui/views/infobar/confirm_infobar.cc'
- 'browser/ui/views/tab_dialogs_views.cc',
- ],
}],
],
}, {
@@ -2974,10 +2977,6 @@
}],
['OS=="mac"', {
'sources': [ '<@(chrome_browser_ui_mac_sources)' ],
- 'sources!': [
- # Task manager has its own sources list. Leave out the views one.
- 'browser/ui/views/task_manager_view.cc',
Nico 2015/03/24 21:55:11 This isn't good: Now both task_manager_mac and tas
tapted 2015/03/25 14:01:20 Wow you're right - do you have a secret way of det
- ],
'dependencies': [
'../third_party/apple_sample_code/apple_sample_code.gyp:apple_sample_code',
'../third_party/google_toolbox_for_mac/google_toolbox_for_mac.gyp:google_toolbox_for_mac',
« 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