summaryrefslogtreecommitdiffstats
path: root/build
diff options
context:
space:
mode:
authorsky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-13 23:31:53 +0000
committersky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-13 23:31:53 +0000
commit3e193f9c0f91dc891cc38774b2e1b800ebfde46e (patch)
treec1c87f7e2be93796af8ddeda303a28103ded7714 /build
parent0c77038af93f567d04da358946c4626d55d24964 (diff)
downloadchromium_src-3e193f9c0f91dc891cc38774b2e1b800ebfde46e.zip
chromium_src-3e193f9c0f91dc891cc38774b2e1b800ebfde46e.tar.gz
chromium_src-3e193f9c0f91dc891cc38774b2e1b800ebfde46e.tar.bz2
Fixes bug in toolkit_views. We shouldn't set the theme provider for
widget_gtk when building chromeos build. We need a #ifdef for CHROMEOS but not using TOOLKIT_VIEWs for the browser window. I'm temporarily adding this one. This bug is the result of Oshima making TOOLKIT_VIEWS set OS_CHROMEOS. Review URL: http://codereview.chromium.org/270092 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@28916 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
-rw-r--r--build/common.gypi3
1 files changed, 3 insertions, 0 deletions
diff --git a/build/common.gypi b/build/common.gypi
index b7ea034..b5af77a 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -269,6 +269,9 @@
['toolkit_views==1', {
'defines': ['TOOLKIT_VIEWS=1'],
}],
+ ['chromeos==1', {
+ 'defines': ['CHROMEOS_TRANSITIONAL=1'],
+ }],
['chromeos==1 or toolkit_views==1', {
'defines': ['OS_CHROMEOS=1'],
}],