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

Unified Diff: chrome/chrome_browser.gypi

Issue 4319003: Replace TabContentsViewGtk with TabContentsViewViews as part of the ongoing (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Last patchset was missing canvas_direct2d.cc edit, fixed it and sent to try bots. Created 10 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
Index: chrome/chrome_browser.gypi
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index 98afc2d8f2843f888ac688c85f69f9ca629c02be..9d0833e4b5c5ddb8ab3e6bf839bea8dbde6942a3 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -3270,6 +3270,8 @@
'browser/views/tab_contents/tab_contents_view_gtk.h',
'browser/views/tab_contents/tab_contents_view_win.cc',
'browser/views/tab_contents/tab_contents_view_win.h',
+ 'browser/views/tab_contents/tab_contents_view_views.h',
+ 'browser/views/tab_contents/tab_contents_view_views.cc',
'browser/views/tabs/base_tab.cc',
'browser/views/tabs/base_tab.h',
'browser/views/tabs/base_tab_strip.cc',
@@ -3412,12 +3414,16 @@
'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/views/tab_contents/tab_contents_view_views.cc',
+ 'browser/views/tab_contents/tab_contents_view_views.h',
],
}],
['touchui==1', {
'sources/': [
['exclude', '^browser/renderer_host/render_widget_host_view_gtk.cc'],
['exclude', '^browser/renderer_host/render_widget_host_view_gtk.h'],
+ ['exclude', '^browser/views/tab_contents/tab_contents_view_gtk.cc'],
+ ['exclude', '^browser/views/tab_contents/tab_contents_view_gtk.h'],
],
}],
['OS=="linux"', {
@@ -4079,6 +4085,18 @@
['exclude', '^browser/views/autocomplete/autocomplete_popup_gtk.h'],
],
}],
+ # Touch build only
+ ['OS=="linux" and toolkit_views==1 and touchui==1', {
+ 'sources/': [
+ ['include', '^browser/views/tab_contents/tab_contents_view_views.cc'],
+ ['include', '^browser/views/tab_contents/tab_contents_view_views.h'],
+ ['exclude', '^browser/views/tab_contents/tab_contents_view_gtk.cc'],
+ ['exclude', '^browser/views/tab_contents/tab_contents_view_gtk.h'],
+ # TODO(anicolao): exclude these once we have DOMUI dialogs
+ # ['exclude', '^browser/gtk/constrained_window_gtk.cc'],
+ # ['exclude', '^browser/gtk/constrained_window_gtk.h'],
+ ],
+ }],
['OS=="linux" and chromeos==1',{
'sources/': [
['exclude', '^browser/extensions/extension_tts_api_linux.cc'],

Powered by Google App Engine
This is Rietveld 408576698