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

Unified Diff: chrome/chrome_browser_ui.gypi

Issue 1972843002: MacViews GN: Get chrome compiling with mac_views_browser = true (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase (patch failure due to r393625) Created 4 years, 7 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/web_applications/web_app_mac.mm ('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 b5b115949e39e49977d0a488c687fb3e649bebd9..814c7e3841d13c915ca890e02a15fa682e94d2de 100644
--- a/chrome/chrome_browser_ui.gypi
+++ b/chrome/chrome_browser_ui.gypi
@@ -110,7 +110,6 @@
'browser/ui/profile_error_dialog.cc',
'browser/ui/profile_error_dialog.h',
'browser/ui/protocol_dialog_delegate.h',
- 'browser/ui/proximity_auth/proximity_auth_error_bubble.cc',
'browser/ui/proximity_auth/proximity_auth_error_bubble.h',
'browser/ui/screen_capture_notification_ui.h',
'browser/ui/search/instant_page.cc',
@@ -657,12 +656,33 @@
'browser/ui/aura/tab_contents/web_drag_bookmark_handler_aura.h',
'browser/ui/ime/ime_window.cc',
'browser/ui/ime/ime_window.h',
+ 'browser/ui/views/accelerator_utils_aura.cc',
+ 'browser/ui/views/apps/app_window_desktop_native_widget_aura_win.cc',
+ 'browser/ui/views/apps/app_window_desktop_native_widget_aura_win.h',
+ 'browser/ui/views/apps/app_window_desktop_window_tree_host_win.cc',
+ 'browser/ui/views/apps/app_window_desktop_window_tree_host_win.h',
+ 'browser/ui/views/apps/app_window_easy_resize_window_targeter.cc',
+ 'browser/ui/views/apps/app_window_easy_resize_window_targeter.h',
+ 'browser/ui/views/apps/chrome_app_window_client_views_chromeos.cc',
+ 'browser/ui/views/apps/chrome_app_window_client_views_win.cc',
+ 'browser/ui/views/apps/chrome_native_app_window_views_aura.cc',
+ 'browser/ui/views/apps/chrome_native_app_window_views_aura.h',
+ 'browser/ui/views/apps/chrome_native_app_window_views_win.cc',
+ 'browser/ui/views/apps/chrome_native_app_window_views_win.h',
+ 'browser/ui/views/apps/glass_app_window_frame_view_win.cc',
+ 'browser/ui/views/apps/glass_app_window_frame_view_win.h',
+ 'browser/ui/views/apps/shaped_app_window_targeter.cc',
+ 'browser/ui/views/apps/shaped_app_window_targeter.h',
+ 'browser/ui/views/color_chooser_aura.cc',
+ 'browser/ui/views/color_chooser_aura.h',
'browser/ui/views/crypto_module_password_dialog_view.cc',
'browser/ui/views/crypto_module_password_dialog_view.h',
'browser/ui/views/desktop_capture/desktop_media_picker_views.cc',
'browser/ui/views/desktop_capture/desktop_media_picker_views.h',
'browser/ui/views/desktop_media_picker_views_deprecated.cc',
'browser/ui/views/desktop_media_picker_views_deprecated.h',
+ 'browser/ui/views/dropdown_bar_host_aura.cc',
+ 'browser/ui/views/frame/browser_non_client_frame_view_factory_views.cc',
'browser/ui/views/ime/ime_window_frame_view.cc',
'browser/ui/views/ime/ime_window_frame_view.h',
'browser/ui/views/ime/ime_window_view.cc',
@@ -918,6 +938,7 @@
'browser/ui/cocoa/content_settings/cookie_tree_node.mm',
'browser/ui/cocoa/content_settings/cookies_tree_controller_bridge.h',
'browser/ui/cocoa/content_settings/cookies_tree_controller_bridge.mm',
+ 'browser/ui/cocoa/create_application_shortcut_cocoa.mm',
'browser/ui/cocoa/create_native_web_modal_manager_cocoa.mm',
'browser/ui/cocoa/custom_frame_view.h',
'browser/ui/cocoa/custom_frame_view.mm',
@@ -925,6 +946,8 @@
'browser/ui/cocoa/dev_tools_controller.mm',
'browser/ui/cocoa/download/background_theme.h',
'browser/ui/cocoa/download/background_theme.mm',
+ 'browser/ui/cocoa/download/download_danger_prompt_impl.cc',
+ 'browser/ui/cocoa/download/download_danger_prompt_impl.h',
'browser/ui/cocoa/download/download_item_button.h',
'browser/ui/cocoa/download/download_item_button.mm',
'browser/ui/cocoa/download/download_item_cell.h',
@@ -1293,6 +1316,7 @@
# See crbug.com/590850
'browser/ui/content_settings/content_setting_media_menu_model.cc',
'browser/ui/content_settings/content_setting_media_menu_model.h',
+ 'browser/ui/proximity_auth/proximity_auth_error_bubble_stub.cc',
],
# Files used only on desktop systems (not iOS, Android, ChromeOS).
'chrome_browser_ui_desktop_sources': [
@@ -1360,6 +1384,8 @@
'browser/ui/views/frame/native_browser_frame_factory_auralinux.cc',
'browser/ui/views/javascript_app_modal_dialog_views_x11.cc',
'browser/ui/views/javascript_app_modal_dialog_views_x11.h',
+ 'browser/ui/views/panels/x11_panel_resizer.cc',
+ 'browser/ui/views/panels/x11_panel_resizer.h',
'browser/ui/views/status_icons/status_icon_linux_wrapper.cc',
'browser/ui/views/status_icons/status_icon_linux_wrapper.h',
'browser/ui/webui/help/version_updater_basic.cc',
@@ -2134,25 +2160,8 @@
],
# Cross-platform (except Mac) views sources.
'chrome_browser_ui_views_non_mac_sources': [
- 'browser/ui/views/accelerator_utils_aura.cc',
'browser/ui/views/accessibility/invert_bubble_view.cc',
'browser/ui/views/accessibility/invert_bubble_view.h',
- 'browser/ui/views/apps/app_window_desktop_native_widget_aura_win.cc',
- 'browser/ui/views/apps/app_window_desktop_native_widget_aura_win.h',
- 'browser/ui/views/apps/app_window_desktop_window_tree_host_win.cc',
- 'browser/ui/views/apps/app_window_desktop_window_tree_host_win.h',
- 'browser/ui/views/apps/app_window_easy_resize_window_targeter.cc',
- 'browser/ui/views/apps/app_window_easy_resize_window_targeter.h',
- 'browser/ui/views/apps/chrome_app_window_client_views_chromeos.cc',
- 'browser/ui/views/apps/chrome_app_window_client_views_win.cc',
- 'browser/ui/views/apps/chrome_native_app_window_views_aura.cc',
- 'browser/ui/views/apps/chrome_native_app_window_views_aura.h',
- 'browser/ui/views/apps/chrome_native_app_window_views_win.cc',
- 'browser/ui/views/apps/chrome_native_app_window_views_win.h',
- 'browser/ui/views/apps/glass_app_window_frame_view_win.cc',
- 'browser/ui/views/apps/glass_app_window_frame_view_win.h',
- 'browser/ui/views/apps/shaped_app_window_targeter.cc',
- 'browser/ui/views/apps/shaped_app_window_targeter.h',
'browser/ui/views/autofill/autofill_popup_base_view.cc',
'browser/ui/views/autofill/autofill_popup_base_view.h',
'browser/ui/views/autofill/autofill_popup_view_views.cc',
@@ -2195,8 +2204,6 @@
'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/color_chooser_aura.cc',
- 'browser/ui/views/color_chooser_aura.h',
'browser/ui/views/color_chooser_win.cc',
'browser/ui/views/confirm_bubble_views.cc',
'browser/ui/views/confirm_bubble_views.h',
@@ -2221,9 +2228,7 @@
'browser/ui/views/download/download_started_animation_views.cc',
'browser/ui/views/dropdown_bar_host.cc',
'browser/ui/views/dropdown_bar_host.h',
- 'browser/ui/views/dropdown_bar_host_aura.cc',
'browser/ui/views/dropdown_bar_host_delegate.h',
- 'browser/ui/views/dropdown_bar_host_mac.mm',
'browser/ui/views/dropdown_bar_view.cc',
'browser/ui/views/dropdown_bar_view.h',
'browser/ui/views/elevation_icon_setter.cc',
@@ -2238,14 +2243,8 @@
'browser/ui/views/frame/browser_command_handler_linux.h',
'browser/ui/views/frame/browser_frame.cc',
'browser/ui/views/frame/browser_frame.h',
- 'browser/ui/views/frame/browser_frame_mac.h',
- 'browser/ui/views/frame/browser_frame_mac.mm',
'browser/ui/views/frame/browser_non_client_frame_view.cc',
'browser/ui/views/frame/browser_non_client_frame_view.h',
- 'browser/ui/views/frame/browser_non_client_frame_view_factory_mac.mm',
- 'browser/ui/views/frame/browser_non_client_frame_view_factory_views.cc',
- 'browser/ui/views/frame/browser_non_client_frame_view_mac.h',
- 'browser/ui/views/frame/browser_non_client_frame_view_mac.mm',
'browser/ui/views/frame/browser_root_view.cc',
'browser/ui/views/frame/browser_root_view.h',
'browser/ui/views/frame/browser_shutdown.cc',
@@ -2264,7 +2263,6 @@
'browser/ui/views/frame/contents_web_view.h',
'browser/ui/views/frame/immersive_mode_controller.cc',
'browser/ui/views/frame/immersive_mode_controller.h',
- 'browser/ui/views/frame/immersive_mode_controller_factory_mac.cc',
'browser/ui/views/frame/immersive_mode_controller_factory_views.cc',
'browser/ui/views/frame/immersive_mode_controller_stub.cc',
'browser/ui/views/frame/immersive_mode_controller_stub.h',
@@ -2274,7 +2272,6 @@
'browser/ui/views/frame/native_browser_frame_factory.cc',
'browser/ui/views/frame/native_browser_frame_factory.h',
'browser/ui/views/frame/native_browser_frame_factory_chromeos.cc',
- 'browser/ui/views/frame/native_browser_frame_factory_mac.mm',
'browser/ui/views/frame/system_menu_insertion_delegate_win.cc',
'browser/ui/views/frame/system_menu_insertion_delegate_win.h',
'browser/ui/views/frame/system_menu_model_builder.cc',
@@ -2359,8 +2356,6 @@
'browser/ui/views/panels/panel_view.h',
'browser/ui/views/panels/taskbar_window_thumbnailer_win.cc',
'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/account_chooser_dialog_view.cc',
'browser/ui/views/passwords/account_chooser_dialog_view.h',
'browser/ui/views/passwords/auto_signin_first_run_dialog_view.cc',
@@ -2432,7 +2427,6 @@
'browser/ui/views/tabs/window_finder.cc',
'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/task_manager_view.cc',
'browser/ui/views/theme_copying_widget.cc',
@@ -2509,7 +2503,15 @@
# migrate from mac_views_browser to a chrome://flag.
'chrome_browser_ui_views_mac_experimental_sources': [
'browser/ui/views/apps/chrome_app_window_client_views_mac.mm',
+ 'browser/ui/views/dropdown_bar_host_mac.mm',
+ 'browser/ui/views/frame/browser_frame_mac.h',
+ 'browser/ui/views/frame/browser_frame_mac.mm',
+ 'browser/ui/views/frame/browser_non_client_frame_view_factory_mac.mm',
+ 'browser/ui/views/frame/browser_non_client_frame_view_mac.h',
+ 'browser/ui/views/frame/browser_non_client_frame_view_mac.mm',
+ 'browser/ui/views/frame/native_browser_frame_factory_mac.mm',
'browser/ui/views/infobars/legacy_infobars_mac.cc',
+ 'browser/ui/views/tabs/window_finder_mac.mm',
],
# Windows-only. Assume ash/aura/views.
'chrome_browser_ui_win_sources': [
« no previous file with comments | « chrome/browser/web_applications/web_app_mac.mm ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698