summaryrefslogtreecommitdiffstats
path: root/chrome/chrome_tests.gypi
diff options
context:
space:
mode:
authorjhawkins@chromium.org <jhawkins@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-12-14 18:47:26 +0000
committerjhawkins@chromium.org <jhawkins@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-12-14 18:47:26 +0000
commit846c3eceac6eb556f77218c50ab16244ebbb9146 (patch)
tree259ee74cab54e263c15b06eec22dcca2d9abf2a8 /chrome/chrome_tests.gypi
parent34608cfed25d4ed2275af1ceb7ff978d0a48ef17 (diff)
downloadchromium_src-846c3eceac6eb556f77218c50ab16244ebbb9146.zip
chromium_src-846c3eceac6eb556f77218c50ab16244ebbb9146.tar.gz
chromium_src-846c3eceac6eb556f77218c50ab16244ebbb9146.tar.bz2
Options2: Pull the trigger.
Options2 is a copy of the resources for and implementation of chrome://settings that will be pared down significantly for UberPage (see bug). BUG=100885 TEST=none R=csilv Review URL: http://codereview.chromium.org/8895023 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@114462 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/chrome_tests.gypi')
-rw-r--r--chrome/chrome_tests.gypi2
1 files changed, 2 insertions, 0 deletions
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index 5ece9ee..c393186 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -917,6 +917,7 @@
['chromeos==0', {
'sources/': [
['exclude', '^browser/ui/webui/options/chromeos/'],
+ ['exclude', '^browser/ui/webui/options2/chromeos/'],
],
}],
],
@@ -2132,6 +2133,7 @@
['exclude', '^browser/ui/webui/chromeos/imageburner/'],
['exclude', '^browser/ui/webui/chromeos/login'],
['exclude', '^browser/ui/webui/options/chromeos/'],
+ ['exclude', '^browser/ui/webui/options2/chromeos/'],
],
}],
['toolkit_uses_gtk == 1', {