chrome/chrome_browser.gypi - Issue 8051010: Separate Virtual Keyboard related conditionals from TouchUI

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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, fix along with review comments Created 9 years, 2 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:

Index: chrome/chrome_browser.gypi

diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi

index 33d9e402557ce2b119609f17d3da5ad55e43ac77..ee9f49f545889e07b0b110644106c6ed3320cc7f 100644

--- a/chrome/chrome_browser.gypi

+++ b/chrome/chrome_browser.gypi

@@ -4023,8 +4023,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', {

@@ -4124,6 +4122,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',

« no previous file with comments | « chrome/browser/ui/webui/chrome_web_ui_factory.cc ('k') | chrome/chrome_tests.gypi » ('j') | no next file with comments »