Index: chrome/chrome_browser.gypi |
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi |
index 1857edecffe7179f0aa5dfdb10db9289e42402a4..db76caa078b5239a5ec73e3c9c02dd61e458ab31 100644 |
--- a/chrome/chrome_browser.gypi |
+++ b/chrome/chrome_browser.gypi |
@@ -3053,6 +3053,9 @@ |
'browser/ui/toolbar/toolbar_model.h', |
'browser/ui/toolbar/wrench_menu_model.cc', |
'browser/ui/toolbar/wrench_menu_model.h', |
+ 'browser/ui/touch/frame/browser_non_client_frame_view_factory_touch.cc', |
+ 'browser/ui/touch/frame/touch_browser_frame_view.cc', |
+ 'browser/ui/touch/frame/touch_browser_frame_view.h', |
'browser/ui/view_ids.h', |
'browser/ui/views/about_chrome_view.cc', |
'browser/ui/views/about_chrome_view.h', |
@@ -3184,6 +3187,8 @@ |
'browser/ui/views/frame/browser_frame_win.cc', |
'browser/ui/views/frame/browser_frame_win.h', |
'browser/ui/views/frame/browser_non_client_frame_view.h', |
+ 'browser/ui/views/frame/browser_non_client_frame_view_factory_gtk.cc', |
+ 'browser/ui/views/frame/browser_non_client_frame_view_factory_win.cc', |
'browser/ui/views/frame/browser_root_view.cc', |
'browser/ui/views/frame/browser_root_view.h', |
'browser/ui/views/frame/browser_view.cc', |
@@ -3508,20 +3513,15 @@ |
], |
}], |
['touchui==0', { |
- 'sources!': [ |
- 'browser/chromeos/dom_ui/login/authenticator_facade.h', |
- 'browser/chromeos/dom_ui/login/authenticator_facade_stub.cc', |
- 'browser/chromeos/dom_ui/login/authenticator_facade_stub.h', |
- 'browser/chromeos/dom_ui/login/login_ui.cc', |
- 'browser/chromeos/dom_ui/login/login_ui.h', |
- 'browser/chromeos/dom_ui/login/login_ui_helpers.cc', |
- 'browser/chromeos/dom_ui/login/login_ui_helpers.h', |
- 'browser/dom_ui/keyboard_ui.cc', |
- 'browser/dom_ui/keyboard_ui.h', |
- 'browser/renderer_host/render_widget_host_view_views.cc', |
- 'browser/renderer_host/render_widget_host_view_views.h', |
- 'browser/ui/views/tab_contents/tab_contents_view_views.cc', |
- 'browser/ui/views/tab_contents/tab_contents_view_views.h', |
+ 'sources/': [ |
+ ['exclude', '^browser/chromeos/dom_ui/login/authenticator_facade.h$'], |
+ ['exclude', '^browser/chromeos/dom_ui/login/authenticator_facade_stub.*'], |
+ ['exclude', '^browser/chromeos/dom_ui/login/login_ui.*'], |
+ ['exclude', '^browser/chromeos/dom_ui/login/login_ui_helpers.*'], |
+ ['exclude', '^browser/dom_ui/keyboard_ui.*'], |
+ ['exclude', '^browser/renderer_host/render_widget_host_view_views.*'], |
+ ['exclude', '^browser/ui/touch/*'], |
+ ['exclude', '^browser/ui/views/tab_contents/tab_contents_view_views.*'], |
], |
}], |
['touchui==1', { |
@@ -3533,6 +3533,7 @@ |
['include', 'browser/chromeos/dom_ui/login/login_ui.h'], |
['include', 'browser/chromeos/dom_ui/login/login_ui_helpers.cc'], |
['include', 'browser/chromeos/dom_ui/login/login_ui_helpers.h'], |
+ ['include', '^browser/ui/touch/*'], |
['exclude', '^browser/renderer_host/render_widget_host_view_gtk.cc'], |
['exclude', '^browser/renderer_host/render_widget_host_view_gtk.h'], |
['exclude', '^browser/renderer_host/gtk_im_context_wrapper.cc'], |
@@ -3969,6 +3970,7 @@ |
['include', '^browser/ui/views/frame/browser_view.h'], |
['include', '^browser/ui/views/frame/browser_frame_gtk.cc'], |
['include', '^browser/ui/views/frame/browser_frame_gtk.h'], |
+ ['include', '^browser/ui/views/frame/browser_non_client_frame_view_factory_gtk.cc'], |
['include', '^browser/ui/views/frame/browser_root_view.cc'], |
['include', '^browser/ui/views/frame/browser_root_view.h'], |
['include', '^browser/ui/views/frame/contents_container.cc'], |
@@ -4291,6 +4293,12 @@ |
'-fno-ipa-cp', |
], |
}], |
+ ['OS=="linux" and touchui==1',{ |
+ 'sources/': [ |
+ ['include', '^browser/ui/touch/*'], |
+ ['exclude', '^browser/ui/views/frame/browser_non_client_frame_view_factory_gtk.cc'], |
+ ], |
+ }], |
], |
# Exclude files that should be excluded for all non-Windows platforms. |
'sources!': [ |