diff options
| author | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-16 19:08:19 +0000 |
|---|---|---|
| committer | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-16 19:08:19 +0000 |
| commit | 9de6459478d57b435a31be7b964f9248d4ec17e3 (patch) | |
| tree | bdcd3115b31cbea5ade38bf6d55d65d0a25046a3 /chrome/browser/chromeos | |
| parent | afae49add8fb4b28405a9cd8f6321eb51f69b037 (diff) | |
| download | chromium_src-9de6459478d57b435a31be7b964f9248d4ec17e3.zip chromium_src-9de6459478d57b435a31be7b964f9248d4ec17e3.tar.gz chromium_src-9de6459478d57b435a31be7b964f9248d4ec17e3.tar.bz2 | |
Land http://codereview.chromium.org/206025 for Charlie:
Fix settings page transparent background issue
Also comment out focus manager check due to bug: http://crbug.com/21378
TEST=none
BUG=none
Review URL: http://codereview.chromium.org/194128
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@26370 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/chromeos')
| -rw-r--r-- | chrome/browser/chromeos/settings_page_view.cc | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/chrome/browser/chromeos/settings_page_view.cc b/chrome/browser/chromeos/settings_page_view.cc index 9c19c34..0702928 100644 --- a/chrome/browser/chromeos/settings_page_view.cc +++ b/chrome/browser/chromeos/settings_page_view.cc @@ -5,6 +5,7 @@ #include "chrome/browser/chromeos/settings_page_view.h" #include "chrome/browser/chromeos/settings_contents_view.h" +#include "skia/ext/skia_utils_gtk.h" #include "views/controls/label.h" #include "views/fill_layout.h" #include "views/widget/widget_gtk.h" @@ -19,6 +20,10 @@ GtkWidget* SettingsPageView::WrapInGtkWidget() { new views::WidgetGtk(views::WidgetGtk::TYPE_CHILD); widget->Init(NULL, gfx::Rect()); widget->SetContentsView(this); + // Set to a solid background with the same color as the widget's bg color. + GtkStyle* window_style = gtk_widget_get_style(widget->GetNativeView()); + set_background(views::Background::CreateSolidBackground( + skia::GdkColorToSkColor(window_style->bg[GTK_STATE_NORMAL]))); widget->Show(); // Removing the widget from the container results in unref'ing the widget. We // need to ref here otherwise the removal deletes the widget. The caller ends |