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

Unified Diff: chrome/chrome_browser_ui.gypi

Issue 716463002: Revert "MacViews: Get chrome/browser/ui/views/frame to compile" (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 1 month 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/frame/native_browser_frame_factory_mac.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 58b1acc795886e9aca3f609fe2a63b753487e511..c1730a226ff4285a547dd53691f6cadd002e3fbd 100644
--- a/chrome/chrome_browser_ui.gypi
+++ b/chrome/chrome_browser_ui.gypi
@@ -301,7 +301,7 @@
'browser/ui/cocoa/browser_window_layout.mm',
'browser/ui/cocoa/browser_window_controller_private.h',
'browser/ui/cocoa/browser_window_controller_private.mm',
- 'browser/ui/cocoa/browser_window_factory_cocoa.mm',
+ 'browser/ui/cocoa/browser_window_factory.mm',
'browser/ui/cocoa/browser_window_utils.h',
'browser/ui/cocoa/browser_window_utils.mm',
'browser/ui/cocoa/bubble_combobox.h',
@@ -2006,11 +2006,9 @@
'browser/ui/views/first_run_bubble.cc',
'browser/ui/views/first_run_bubble.h',
'browser/ui/views/frame/browser_frame.cc',
- 'browser/ui/views/frame/browser_frame.h',
'browser/ui/views/frame/browser_frame_common_win.cc',
'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.h',
'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.h',
@@ -2023,7 +2021,6 @@
'browser/ui/views/frame/browser_view_layout.cc',
'browser/ui/views/frame/browser_view_layout_delegate.h',
'browser/ui/views/frame/browser_view_layout.h',
- 'browser/ui/views/frame/browser_window_factory.cc',
'browser/ui/views/frame/browser_window_property_manager_win.cc',
'browser/ui/views/frame/browser_window_property_manager_win.h',
'browser/ui/views/frame/contents_layout_manager.cc',
@@ -2031,8 +2028,7 @@
'browser/ui/views/frame/contents_web_view.cc',
'browser/ui/views/frame/contents_web_view.h',
'browser/ui/views/frame/immersive_mode_controller.cc',
- 'browser/ui/views/frame/immersive_mode_controller_factory_ash.cc',
- 'browser/ui/views/frame/immersive_mode_controller_factory_mac.cc',
+ 'browser/ui/views/frame/immersive_mode_controller_factory.cc',
'browser/ui/views/frame/immersive_mode_controller.h',
'browser/ui/views/frame/immersive_mode_controller_stub.cc',
'browser/ui/views/frame/immersive_mode_controller_stub.h',
@@ -2041,7 +2037,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.cc',
'browser/ui/views/frame/native_browser_frame.h',
'browser/ui/views/frame/opaque_browser_frame_view_layout.cc',
'browser/ui/views/frame/opaque_browser_frame_view_layout_delegate.h',
@@ -2803,15 +2798,7 @@
['use_ash == 1', {
'sources': [ '<@(chrome_browser_ui_ash_views_sources)' ],
}],
- ['OS=="mac"', {
- 'conditions': [
- ['mac_views_browser==1', {
- 'sources!': [ 'browser/ui/cocoa/browser_window_factory_cocoa.mm', ],
- }, {
- 'sources!': [ 'browser/ui/views/frame/browser_window_factory.cc', ],
- }],
- ],
- }, {
+ ['OS!="mac"', {
'sources': [ '<@(chrome_browser_ui_views_non_mac_sources)' ],
'dependencies': [
'<(DEPTH)/extensions/components/extensions_components.gyp:native_app_window',
« no previous file with comments | « chrome/browser/ui/views/frame/native_browser_frame_factory_mac.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698