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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/chrome_browser_ui.gypi

Issue 935193003: [Mac] Use chrome_native_app_window_views when mac_views_browser is enabled. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Put behind mac_views_browser GYP flag instead. Created 5 years, 10 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
« chrome/browser/ui/views/apps/chrome_native_app_window_views.cc ('K') | « chrome/browser/ui/views/apps/chrome_native_app_window_views.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 e05610601d8f4deda3c83050ce63c8ec9c42bba5..f13fee12a94e778a6760465707708b37c1be09aa 100644
--- a/chrome/chrome_browser_ui.gypi
+++ b/chrome/chrome_browser_ui.gypi
@@ -1338,8 +1338,6 @@
# Counts desktop Linux and ChromeOS.
'chrome_browser_ui_linux_sources': [
'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/webui/certificate_viewer_ui.cc',
'browser/ui/webui/certificate_viewer_ui.h',
'browser/ui/webui/certificate_viewer_webui.cc',
@@ -1835,6 +1833,13 @@
'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/apps/chrome_apps_client_views.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/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/chrome_browser_main_extra_parts_views.cc',
'browser/ui/views/chrome_browser_main_extra_parts_views.h',
'browser/ui/views/chrome_constrained_window_views_client.cc',
@@ -1845,10 +1850,14 @@
'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',
@@ -1946,15 +1955,10 @@
'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',
@@ -2066,8 +2070,6 @@
'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',
@@ -2135,8 +2137,6 @@
'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',
@@ -2841,15 +2841,30 @@
'conditions': [
['mac_views_browser==1', {
'sources!': [
+ 'browser/ui/cocoa/apps/chrome_app_window_client_cocoa.mm',
'browser/ui/cocoa/bookmarks/bookmark_drag_drop_cocoa.mm',
'browser/ui/cocoa/browser_window_factory_cocoa.mm',
'browser/ui/cocoa/infobars/confirm_infobar_controller.mm',
'browser/ui/cocoa/tab_dialogs_cocoa.mm',
],
+ 'dependencies': [
+ '<(DEPTH)/extensions/components/extensions_components.gyp:native_app_window',
+ ],
}, {
'sources!': [
+ 'browser/ui/views/apps/chrome_apps_client_views.cc',
tapted 2015/02/20 07:50:30 These lists in `conditions` need to be duplicated
jackhou1 2015/02/26 04:35:16 Done.
+ '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',
],
@@ -2990,6 +3005,8 @@
],
'sources': [ '<@(chrome_browser_ui_win_sources)' ],
'sources!': [
+ 'browser/ui/views/apps/chrome_apps_client_views.cc',
+ 'browser/ui/views/apps/keyboard_hook_handler.cc',
'browser/ui/views/frame/taskbar_decorator.cc'
],
'conditions': [
« chrome/browser/ui/views/apps/chrome_native_app_window_views.cc ('K') | « chrome/browser/ui/views/apps/chrome_native_app_window_views.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698