summaryrefslogtreecommitdiffstats
path: root/build
diff options
context:
space:
mode:
authorsky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-15 18:44:51 +0000
committersky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-15 18:44:51 +0000
commitf941f47a837bc6d98937acc6a13603bb7c06d286 (patch)
tree50585ebe530e0a03029c84654a77658d43e27f52 /build
parent6c32a71b9847fddb0946677ee926f88fd340691c (diff)
downloadchromium_src-f941f47a837bc6d98937acc6a13603bb7c06d286.zip
chromium_src-f941f47a837bc6d98937acc6a13603bb7c06d286.tar.gz
chromium_src-f941f47a837bc6d98937acc6a13603bb7c06d286.tar.bz2
Wires keeping the launcher up to date with the browser. I also needed GetBrowserViewForNativeWindow, so I had to wire up ViewProps for it to work correctly.
BUG=97262 TEST=none R=ben@chromium.org Review URL: http://codereview.chromium.org/8289022 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@105677 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
-rw-r--r--build/common.gypi4
1 files changed, 3 insertions, 1 deletions
diff --git a/build/common.gypi b/build/common.gypi
index 25816560..92c2da0 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -1272,7 +1272,9 @@
'sources/': [ ['exclude', '_views\\.(h|cc)$'] ]
}],
['use_aura==0', {
- 'sources/': [ ['exclude', '_aura\\.(h|cc)$'] ]
+ 'sources/': [ ['exclude', '_aura\\.(h|cc)$'],
+ ['exclude', '(^|/)aura/'],
+ ]
}],
['use_aura==0 or use_x11==0', {
'sources/': [ ['exclude', '_aurax11\\.(h|cc)$'] ]