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

Unified Diff: chrome/chrome_browser.gypi

Issue 3130029: Lands http://codereview.chromium.org/3153008 for bryeung: (Closed)
Patch Set: YAM Created 10 years, 4 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_input_apitest.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 68ce2f815816a3573249cd9c43d21155b172d307..b257a1c44c329e055c694b176a92a58c6be70d3b 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -1362,6 +1362,8 @@
'browser/extensions/extension_infobar_module_constants.h',
'browser/extensions/extension_infobar_delegate.cc',
'browser/extensions/extension_infobar_delegate.h',
+ 'browser/extensions/extension_input_api.cc',
+ 'browser/extensions/extension_input_api.h',
'browser/extensions/extension_install_ui.cc',
'browser/extensions/extension_install_ui.h',
'browser/extensions/extension_menu_manager.cc',
@@ -3667,6 +3669,14 @@
['exclude', '^browser/browser_list_gtk.cc'],
],
}],
+ # Exclude these toolkit_views specific files again.
+ # (Required because of the '^browser/extensions/' include above)
+ ['toolkit_views==0', {
+ 'sources/': [
+ ['exclude', '^browser/extensions/extension_input_api.cc'],
+ ['exclude', '^browser/extensions/extension_input_api.h'],
+ ],
+ }],
# These GTK files haven't been ported to views, while ChromeOS has
# its own separate implementation below. So re-include them only on
# non-ChromeOS views Linux builds.
« no previous file with comments | « chrome/browser/extensions/extension_input_apitest.cc ('k') | chrome/chrome_tests.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698