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

Unified Diff: chrome/chrome_browser.gypi

Issue 6869024: Add IME UI related extension API. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Fix build errors Created 9 years, 8 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 a04f7ffe241663d4446a6507a23f19229eeb2470..7320fd1b019b35f8feee5ecad1267a18ab045541 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -908,6 +908,8 @@
'browser/extensions/extension_infobar_module_constants.h',
'browser/extensions/extension_input_api.cc',
'browser/extensions/extension_input_api.h',
+ 'browser/extensions/extension_input_ui_api.cc',
+ 'browser/extensions/extension_input_ui_api.h',
'browser/extensions/extension_install_dialog.h',
'browser/extensions/extension_install_ui.cc',
'browser/extensions/extension_install_ui.h',
@@ -3468,6 +3470,8 @@
['chromeos==0', {
'sources/': [
['exclude', '^browser/chromeos'],
+ ['exclude', '^browser/extensions/extension_input_ui_api.cc'],
+ ['exclude', '^browser/extensions/extension_input_ui_api.h'],
['exclude', '^browser/ui/webui/chromeos'],
['exclude', '^browser/ui/webui/options/chromeos'],
['exclude', 'browser/extensions/extension_tts_api_chromeos.cc'],
@@ -3531,6 +3535,8 @@
'sources/': [
['exclude', '^browser/chromeos/frame/dom_*'],
['exclude', '^browser/chromeos/login/dom_*'],
+ ['exclude', '^browser/extensions/extension_input_ui_api.cc'],
+ ['exclude', '^browser/extensions/extension_input_ui_api.h'],
['exclude', '^browser/webui/keyboard_ui.*'],
['exclude', '^browser/renderer_host/render_widget_host_view_views.*'],
['exclude', '^browser/ui/touch/*'],
@@ -4221,6 +4227,14 @@
['exclude', '^browser/ui/views/select_file_dialog.cc'],
],
}],
+ # Exclude extension_input_ui_api again
+ # (Required because of the '^browser/extensions/' include abrove)
+ ['OS=="linux" and ( touchui==0 or chomeos==0 )', {
+ 'sources/': [
+ ['exclude', '^browser/extensions/extension_input_ui_api.cc'],
+ ['exclude', '^browser/extensions/extension_input_ui_api.h'],
+ ],
+ }],
# GTK build only
['OS=="linux" and toolkit_views==0', {
'sources/': [

Powered by Google App Engine
This is Rietveld 408576698