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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/chrome_browser_ui.gypi

Issue 664703003: Stash: hacks to get MacViews chrome browser window working (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git/+/master
Patch Set: Created 6 years 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/views/toolbar/toolbar_view.cc ('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 0525afa64fa8cb755b2c4ff665d8ebe651e876f7..546d0be1925148c863f51dee452bc39660ce3c8f 100644
--- a/chrome/chrome_browser_ui.gypi
+++ b/chrome/chrome_browser_ui.gypi
@@ -1857,40 +1857,41 @@
],
# Cross-platform (except Mac) views sources. We assume app list is enabled.
'chrome_browser_ui_views_non_mac_sources': [
+ 'browser/ui/views/frame/taskbar_decorator.cc',
'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_info_dialog/app_info_dialog_views.cc',
- 'browser/ui/views/apps/app_info_dialog/app_info_dialog_views.h',
- 'browser/ui/views/apps/app_info_dialog/app_info_footer_panel.cc',
- 'browser/ui/views/apps/app_info_dialog/app_info_footer_panel.h',
- 'browser/ui/views/apps/app_info_dialog/app_info_header_panel.cc',
- 'browser/ui/views/apps/app_info_dialog/app_info_header_panel.h',
- 'browser/ui/views/apps/app_info_dialog/app_info_panel.cc',
- 'browser/ui/views/apps/app_info_dialog/app_info_panel.h',
- 'browser/ui/views/apps/app_info_dialog/app_info_permissions_panel.cc',
- 'browser/ui/views/apps/app_info_dialog/app_info_permissions_panel.h',
- 'browser/ui/views/apps/app_info_dialog/app_info_summary_panel.cc',
- 'browser/ui/views/apps/app_info_dialog/app_info_summary_panel.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/chrome_apps_client_views_win.cc',
- 'browser/ui/views/apps/chrome_native_app_window_views.cc',
- 'browser/ui/views/apps/chrome_native_app_window_views.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/desktop_keyboard_capture.cc',
- 'browser/ui/views/apps/desktop_keyboard_capture.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/keyboard_hook_handler.h',
- 'browser/ui/views/apps/keyboard_hook_handler_win.cc',
- 'browser/ui/views/apps/shaped_app_window_targeter.cc',
- 'browser/ui/views/apps/shaped_app_window_targeter.h',
- 'browser/ui/views/ash/tab_scrubber.cc',
- 'browser/ui/views/ash/tab_scrubber.h',
+ # 'browser/ui/views/apps/app_info_dialog/app_info_dialog_views.cc',
+ # 'browser/ui/views/apps/app_info_dialog/app_info_dialog_views.h',
+ # 'browser/ui/views/apps/app_info_dialog/app_info_footer_panel.cc',
+ # 'browser/ui/views/apps/app_info_dialog/app_info_footer_panel.h',
+ # 'browser/ui/views/apps/app_info_dialog/app_info_header_panel.cc',
+ # 'browser/ui/views/apps/app_info_dialog/app_info_header_panel.h',
+ # 'browser/ui/views/apps/app_info_dialog/app_info_panel.cc',
+ # 'browser/ui/views/apps/app_info_dialog/app_info_panel.h',
+ # 'browser/ui/views/apps/app_info_dialog/app_info_permissions_panel.cc',
+ # 'browser/ui/views/apps/app_info_dialog/app_info_permissions_panel.h',
+ # 'browser/ui/views/apps/app_info_dialog/app_info_summary_panel.cc',
+ # 'browser/ui/views/apps/app_info_dialog/app_info_summary_panel.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/chrome_apps_client_views_win.cc',
+ # 'browser/ui/views/apps/chrome_native_app_window_views.cc',
+ # 'browser/ui/views/apps/chrome_native_app_window_views.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/desktop_keyboard_capture.cc',
+ # 'browser/ui/views/apps/desktop_keyboard_capture.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/keyboard_hook_handler.h',
+ # 'browser/ui/views/apps/keyboard_hook_handler_win.cc',
+ # 'browser/ui/views/apps/shaped_app_window_targeter.cc',
+ # 'browser/ui/views/apps/shaped_app_window_targeter.h',
+ # 'browser/ui/views/ash/tab_scrubber.cc',
+ # 'browser/ui/views/ash/tab_scrubber.h',
'browser/ui/views/autofill/autofill_dialog_views.cc',
'browser/ui/views/autofill/autofill_dialog_views.h',
'browser/ui/views/autofill/autofill_popup_base_view.cc',
@@ -1937,7 +1938,7 @@
'browser/ui/views/certificate_viewer_win.cc',
'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/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',
@@ -1956,10 +1957,10 @@
'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/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/detachable_toolbar_view.cc',
'browser/ui/views/detachable_toolbar_view.h',
'browser/ui/views/download/download_danger_prompt_views.cc',
@@ -1991,20 +1992,20 @@
'browser/ui/views/extensions/bundle_installed_bubble.cc',
'browser/ui/views/extensions/extension_action_platform_delegate_views.cc',
'browser/ui/views/extensions/extension_action_platform_delegate_views.h',
- 'browser/ui/views/extensions/extension_dialog.cc',
- 'browser/ui/views/extensions/extension_dialog.h',
+ # 'browser/ui/views/extensions/extension_dialog.cc',
+ # 'browser/ui/views/extensions/extension_dialog.h',
'browser/ui/views/extensions/extension_dialog_observer.cc',
'browser/ui/views/extensions/extension_dialog_observer.h',
'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_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',
- 'browser/ui/views/extensions/extension_popup.h',
- 'browser/ui/views/extensions/extension_uninstall_dialog_view.cc',
+ # 'browser/ui/views/extensions/extension_popup.cc',
+ # 'browser/ui/views/extensions/extension_popup.h',
+ # 'browser/ui/views/extensions/extension_uninstall_dialog_view.cc',
'browser/ui/views/extensions/extension_view_views.cc',
'browser/ui/views/extensions/extension_view_views.h',
'browser/ui/views/extensions/media_galleries_dialog_views.cc',
@@ -2021,8 +2022,11 @@
'browser/ui/views/frame/browser_frame_common_win.h',
'browser/ui/views/frame/browser_frame_mac.h',
'browser/ui/views/frame/browser_frame_mac.mm',
+ 'browser/ui/views/frame/browser_frame_view_mac.h',
+ 'browser/ui/views/frame/browser_frame_view_mac.mm',
'browser/ui/views/frame/browser_non_client_frame_view.cc',
'browser/ui/views/frame/browser_non_client_frame_view_factory_aura.cc',
+ 'browser/ui/views/frame/browser_non_client_frame_view_factory_mac.mm',
'browser/ui/views/frame/browser_non_client_frame_view.h',
'browser/ui/views/frame/browser_root_view.cc',
'browser/ui/views/frame/browser_root_view.h',
@@ -2077,8 +2081,8 @@
'browser/ui/views/fullscreen_exit_bubble_views.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/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',
@@ -2150,16 +2154,16 @@
'browser/ui/views/open_pdf_in_reader_bubble_view.h',
'browser/ui/views/outdated_upgrade_bubble_view.cc',
'browser/ui/views/outdated_upgrade_bubble_view.h',
- 'browser/ui/views/panels/panel_frame_view.cc',
- 'browser/ui/views/panels/panel_frame_view.h',
- 'browser/ui/views/panels/panel_stack_view.cc',
- 'browser/ui/views/panels/panel_stack_view.h',
- 'browser/ui/views/panels/panel_view.cc',
- '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/panels/panel_frame_view.cc',
+ # 'browser/ui/views/panels/panel_frame_view.h',
+ # 'browser/ui/views/panels/panel_stack_view.cc',
+ # 'browser/ui/views/panels/panel_stack_view.h',
+ # 'browser/ui/views/panels/panel_view.cc',
+ # '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/credentials_item_view.cc',
'browser/ui/views/passwords/credentials_item_view.h',
'browser/ui/views/passwords/manage_password_items_view.cc',
@@ -2184,8 +2188,8 @@
'browser/ui/views/profiles/supervised_user_avatar_label.h',
'browser/ui/views/profiles/user_manager_view.cc',
'browser/ui/views/profiles/user_manager_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/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',
@@ -2211,8 +2215,8 @@
'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_contents/chrome_web_contents_view_delegate_views.cc',
+ # 'browser/ui/views/tab_contents/chrome_web_contents_view_delegate_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',
@@ -2226,8 +2230,8 @@
'browser/ui/views/update_recommended_message_box.h',
'browser/ui/views/validation_message_bubble_delegate.cc',
'browser/ui/views/validation_message_bubble_delegate.h',
- 'browser/ui/views/validation_message_bubble_view.cc',
- 'browser/ui/views/web_contents_modal_dialog_manager_views.cc',
+ # 'browser/ui/views/validation_message_bubble_view.cc',
+ # 'browser/ui/views/web_contents_modal_dialog_manager_views.cc',
'browser/ui/views/website_settings/permissions_bubble_view.cc',
'browser/ui/views/website_settings/permissions_bubble_view.h',
'browser/ui/views/website_settings/permission_selector_view.cc',
@@ -2516,7 +2520,6 @@
'browser/ui/startup/autolaunch_prompt.cc',
'browser/ui/views/apps/chrome_apps_client_views.cc',
'browser/ui/views/apps/keyboard_hook_handler.cc',
- 'browser/ui/views/frame/taskbar_decorator.cc',
'browser/ui/webui/certificate_viewer_ui.cc',
'browser/ui/webui/certificate_viewer_ui.h',
'browser/ui/webui/certificate_viewer_webui.cc',
@@ -2808,7 +2811,7 @@
],
}],
['toolkit_views==1', {
- 'sources': [ '<@(chrome_browser_ui_views_sources)' ],
+ 'sources': [ '<@(chrome_browser_ui_views_sources)', '<@(chrome_browser_ui_views_non_mac_sources)' ],
'dependencies': [
'<(DEPTH)/components/components.gyp:constrained_window',
],
@@ -2903,8 +2906,8 @@
'sources': [ '<@(chrome_browser_ui_mac_sources)' ],
'sources!': [
# Mac has its own way of drawing tabs.
- 'browser/ui/tabs/tab_resources.cc',
- 'browser/ui/tabs/tab_resources.h',
+ # 'browser/ui/tabs/tab_resources.cc',
+ # '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.
« no previous file with comments | « chrome/browser/ui/views/toolbar/toolbar_view.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698