| Index: chrome/chrome_browser.gypi
|
| diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
|
| index 168597eb3d2e1c7f8edd8b074aae7f4024435094..5d5f28ceed160ae6ac332d13633f52ef2ab90fd1 100644
|
| --- a/chrome/chrome_browser.gypi
|
| +++ b/chrome/chrome_browser.gypi
|
| @@ -3304,6 +3304,8 @@
|
| 'browser/ui/views/tab_contents/tab_contents_view_gtk.h',
|
| 'browser/ui/views/tab_contents/tab_contents_view_win.cc',
|
| 'browser/ui/views/tab_contents/tab_contents_view_win.h',
|
| + 'browser/ui/views/tab_contents/tab_contents_view_views.cc',
|
| + 'browser/ui/views/tab_contents/tab_contents_view_views.h',
|
| 'browser/ui/views/tabs/base_tab.cc',
|
| 'browser/ui/views/tabs/base_tab.h',
|
| 'browser/ui/views/tabs/base_tab_strip.cc',
|
| @@ -3435,12 +3437,12 @@
|
| ],
|
| },
|
| }],
|
| - ['use_gconf==0', {
|
| - 'sources!': [
|
| + ['use_gconf==0', {
|
| + 'sources!': [
|
| 'browser/gtk/gconf_titlebar_listener.cc',
|
| 'browser/gtk/gconf_titlebar_listener.h',
|
| - ],
|
| - }],
|
| + ],
|
| + }],
|
| ['use_gnome_keyring==0', {
|
| 'sources!': [
|
| 'browser/password_manager/native_backend_gnome_x.h',
|
| @@ -3453,6 +3455,8 @@
|
| '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',
|
| ],
|
| }],
|
| ['touchui==1', {
|
| @@ -3461,6 +3465,8 @@
|
| ['exclude', '^browser/renderer_host/render_widget_host_view_gtk.h'],
|
| ['exclude', '^browser/renderer_host/gtk_im_context_wrapper.cc'],
|
| ['exclude', '^browser/renderer_host/gtk_im_context_wrapper.h'],
|
| + ['exclude', '^browser/views/tab_contents/tab_contents_view_gtk.cc'],
|
| + ['exclude', '^browser/views/tab_contents/tab_contents_view_gtk.h'],
|
| ],
|
| }],
|
| ['OS=="linux"', {
|
| @@ -4133,6 +4139,18 @@
|
| ['exclude', '^browser/ui/views/autocomplete/autocomplete_popup_gtk.h'],
|
| ],
|
| }],
|
| + # Touch build only
|
| + ['OS=="linux" and toolkit_views==1 and touchui==1', {
|
| + 'sources/': [
|
| + ['include', '^browser/ui/views/tab_contents/tab_contents_view_views.cc'],
|
| + ['include', '^browser/ui/views/tab_contents/tab_contents_view_views.h'],
|
| + ['exclude', '^browser/ui/views/tab_contents/tab_contents_view_gtk.cc'],
|
| + ['exclude', '^browser/ui/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'],
|
|
|