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

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: Rebase Created 9 years, 7 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
« no previous file with comments | « chrome/browser/extensions/extension_service.cc ('k') | chrome/common/extensions/api/extension_api.json » ('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 d9e306d8ab14e364294aac08a3d9af06e2290b75..6ec993eeb92afb27978cfd333ee14e20223b9c6a 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -917,6 +917,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',
@@ -3487,6 +3489,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_file_browser_private_api.cc'],
@@ -3550,6 +3554,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/*'],
@@ -4241,6 +4247,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 chromeos==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/': [
« no previous file with comments | « chrome/browser/extensions/extension_service.cc ('k') | chrome/common/extensions/api/extension_api.json » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698