diff options
| -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 |