summaryrefslogtreecommitdiffstats
path: root/chrome/chrome.gyp
diff options
context:
space:
mode:
authoraa@chromium.org <aa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-15 06:36:08 +0000
committeraa@chromium.org <aa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-15 06:36:08 +0000
commit83fe23a3ff26c5dea371ce94f6a909c4d081b145 (patch)
tree5117b7c3928d608f51f31a3279997e2716db6110 /chrome/chrome.gyp
parent8d34c475c53b27511a912880aebea627ad651625 (diff)
downloadchromium_src-83fe23a3ff26c5dea371ce94f6a909c4d081b145.zip
chromium_src-83fe23a3ff26c5dea371ce94f6a909c4d081b145.tar.gz
chromium_src-83fe23a3ff26c5dea371ce94f6a909c4d081b145.tar.bz2
Reverting r29095 (removes wrench integration for
browser actions). TBR=mpcomplete@chromium.org BUG=24379,24671 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@29097 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/chrome.gyp')
-rwxr-xr-xchrome/chrome.gyp3
1 files changed, 2 insertions, 1 deletions
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp
index c084794..b5b206a 100755
--- a/chrome/chrome.gyp
+++ b/chrome/chrome.gyp
@@ -58,6 +58,7 @@
'browser/browser_init_browsertest.cc',
'browser/crash_recovery_browsertest.cc',
'browser/download/save_page_browsertest.cc',
+ 'browser/extensions/browser_action_test.cc',
'browser/extensions/autoupdate_interceptor.cc',
'browser/extensions/autoupdate_interceptor.h',
'browser/extensions/cross_origin_xhr_apitest.cc',
@@ -78,7 +79,6 @@
'browser/ssl/ssl_browser_tests.cc',
],
'browser_tests_sources_win_specific': [
- 'browser/extensions/browser_action_apitest.cc',
'browser/extensions/extension_devtools_browsertest.cc',
'browser/extensions/extension_devtools_browsertest.h',
'browser/extensions/extension_devtools_browsertests.cc',
@@ -98,6 +98,7 @@
'browser/task_manager_browsertest.cc',
],
'browser_tests_sources_exclude_on_mac': [
+ 'browser/extensions/browser_action_test.cc',
'browser/extensions/cross_origin_xhr_apitest.cc',
'browser/extensions/execute_script_apitest.cc',
'browser/extensions/extension_apitest.cc',