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

Unified Diff: chrome/chrome_browser.gypi

Issue 8776034: Remove a touchui section from chrome_browser.gypi (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Missing file exclusion added. Created 9 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
« no previous file with comments | « chrome/browser/ui/views/frame/browser_view.cc ('k') | chrome/chrome_tests.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/chrome_browser.gypi
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index 69e6de9472291c73c188abf7ed8c56e089d5cb29..b3f6cee05a9f431dfa2d5e956018ab1697dc585d 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -4058,8 +4058,6 @@
['exclude', 'browser/extensions/extension_input_ime_api.h'],
['exclude', 'browser/extensions/extension_input_method_api.cc'],
['exclude', 'browser/extensions/extension_input_method_api.h'],
- ['exclude', 'browser/extensions/extension_input_ui_api.cc'],
- ['exclude', 'browser/extensions/extension_input_ui_api.h'],
['exclude', 'browser/extensions/extension_tts_api_chromeos.cc'],
['exclude', 'browser/oom_priority_manager.cc'],
['exclude', 'browser/oom_priority_manager.h'],
@@ -4143,14 +4141,6 @@
'browser/password_manager/native_backend_gnome_x.h',
],
}],
- ['use_virtual_keyboard==0', {
- 'sources/': [
- ['exclude', '^browser/extensions/extension_input_ui_api.cc'],
- ['exclude', '^browser/extensions/extension_input_ui_api.h'],
- ['exclude', '^browser/ui/touch/status_bubble_touch.cc'],
- ['exclude', '^browser/ui/touch/status_bubble_touch.h'],
- ],
- }],
# linux/chromeos only status area button.
['OS=="linux" and use_aura==1', {
'sources/': [
@@ -4257,6 +4247,8 @@
}],
['use_virtual_keyboard==0', {
'sources/': [
+ ['exclude', '^browser/extensions/extension_input_ui_api.*'],
+ ['exclude', '^browser/ui/touch/status_bubble_touch.*'],
['exclude', '^browser/ui/virtual_keyboard/*'],
['exclude', '^browser/ui/webui/keyboard_ui.*'],
],
@@ -4970,7 +4962,7 @@
}],
# Exclude extension_input_ui_api that depends on chromeos again
# (Required because of the '^browser/extensions/' include above)
- ['chromeos == 0', {
+ ['chromeos == 0 or use_virtual_keyboard == 0', {
'sources/': [
['exclude', '^browser/extensions/extension_input_ui_api.cc'],
['exclude', '^browser/extensions/extension_input_ui_api.h'],
« no previous file with comments | « chrome/browser/ui/views/frame/browser_view.cc ('k') | chrome/chrome_tests.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698