From 74ca89f158618b36a3dd2ce9866cc70de402bee5 Mon Sep 17 00:00:00 2001 From: "ben@chromium.org" Date: Sat, 7 Nov 2009 23:33:46 +0000 Subject: blind fix for toolkit_views git-svn-id: svn://svn.chromium.org/chrome/trunk/src@31395 0039d316-1c4b-4281-b951-d872f2087c98 --- views/widget/widget_gtk.cc | 4 ++-- views/widget/widget_gtk.h | 2 +- views/widget/widget_win.cc | 1 - 3 files changed, 3 insertions(+), 4 deletions(-) (limited to 'views/widget') diff --git a/views/widget/widget_gtk.cc b/views/widget/widget_gtk.cc index 48ae642..ee3e197 100644 --- a/views/widget/widget_gtk.cc +++ b/views/widget/widget_gtk.cc @@ -527,8 +527,8 @@ ThemeProvider* WidgetGtk::GetThemeProvider() const { return default_theme_provider_.get(); } -ThemeProvider* WidgetGtk::GetDefaultThemeProvider() { - return NULL; +ThemeProvider* WidgetGtk::GetDefaultThemeProvider() const { + return default_theme_provider_.get(); } FocusManager* WidgetGtk::GetFocusManager() { diff --git a/views/widget/widget_gtk.h b/views/widget/widget_gtk.h index b36856f..57b387c 100644 --- a/views/widget/widget_gtk.h +++ b/views/widget/widget_gtk.h @@ -141,7 +141,7 @@ class WidgetGtk void* value); virtual void* GetNativeWindowProperty(const std::wstring& name); virtual ThemeProvider* GetThemeProvider() const; - virtual ThemeProvider* GetDefaultThemeProvider(); + virtual ThemeProvider* GetDefaultThemeProvider() const; virtual FocusManager* GetFocusManager(); virtual void ViewHierarchyChanged(bool is_add, View *parent, View *child); diff --git a/views/widget/widget_win.cc b/views/widget/widget_win.cc index 1853d5e..79956a8 100644 --- a/views/widget/widget_win.cc +++ b/views/widget/widget_win.cc @@ -363,7 +363,6 @@ ThemeProvider* WidgetWin::GetDefaultThemeProvider() const { return default_theme_provider_.get(); } - FocusManager* WidgetWin::GetFocusManager() { if (focus_manager_.get()) return focus_manager_.get(); -- cgit v1.1