diff options
| author | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-13 23:31:53 +0000 |
|---|---|---|
| committer | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-13 23:31:53 +0000 |
| commit | 3e193f9c0f91dc891cc38774b2e1b800ebfde46e (patch) | |
| tree | c1c87f7e2be93796af8ddeda303a28103ded7714 | |
| parent | 0c77038af93f567d04da358946c4626d55d24964 (diff) | |
| download | chromium_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
| -rw-r--r-- | build/common.gypi | 3 | ||||
| -rw-r--r-- | views/widget/widget_gtk.cc | 3 |
2 files changed, 5 insertions, 1 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'], }], diff --git a/views/widget/widget_gtk.cc b/views/widget/widget_gtk.cc index 51140a6..cfd9a44 100644 --- a/views/widget/widget_gtk.cc +++ b/views/widget/widget_gtk.cc @@ -233,7 +233,8 @@ void WidgetGtk::Init(GtkWidget* parent, // Force creation of the RootView if it hasn't been created yet. GetRootView(); -#if !defined(OS_CHROMEOS) + // TODO(sky): nuke this once toolkit_views becomes chromeos. +#if !defined(CHROMEOS_TRANSITIONAL) default_theme_provider_.reset(new DefaultThemeProvider()); #endif |