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

Unified Diff: chrome/chrome_browser.gypi

Issue 8051010: Separate Virtual Keyboard related conditionals from TouchUI (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Rebased on ToT, modified resources/options/language_options.html Created 9 years, 3 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
Index: chrome/chrome_browser.gypi
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index af9e591543922a87b432a417eab07f5153554660..71de2c1ad090a6abf1978850698cbb6956b15304 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -4022,8 +4022,6 @@
['exclude', '^browser/renderer_host/accelerated_surface_container_touch.h'],
['exclude', '^browser/renderer_host/render_widget_host_view_views_touch.cc'],
['exclude', '^browser/ui/touch/*'],
- ['exclude', '^browser/ui/virtual_keyboard/*'],
- ['exclude', '^browser/ui/webui/keyboard_ui.*'],
],
}],
['touchui==1', {
@@ -4123,6 +4121,12 @@
'../ui/aura/aura.gyp:aura',
],
}],
+ ['use_virtual_keyboard==0', {
+ 'sources/': [
+ ['exclude', '^browser/ui/virtual_keyboard/*'],
+ ['exclude', '^browser/ui/webui/keyboard_ui.*'],
+ ],
+ }],
['OS=="linux" and use_aura==1', {
'dependencies': [
'../build/linux/system.gyp:dbus',

Powered by Google App Engine
This is Rietveld 408576698