diff options
| author | erg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-01-20 20:38:08 +0000 |
|---|---|---|
| committer | erg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-01-20 20:38:08 +0000 |
| commit | 6ff244f244f4e52e5e3dff32b0852bd5be80ec7d (patch) | |
| tree | 009ce8d2f474444e740266b4e82f2c9a6cde58b2 /chrome/views/background.cc | |
| parent | 577e30290cc9389a96303b8dd7543459dc50c236 (diff) | |
| download | chromium_src-6ff244f244f4e52e5e3dff32b0852bd5be80ec7d.zip chromium_src-6ff244f244f4e52e5e3dff32b0852bd5be80ec7d.tar.gz chromium_src-6ff244f244f4e52e5e3dff32b0852bd5be80ec7d.tar.bz2 | |
Fix the broken commit in r8250. The problem was that basictypes.h
wasn't getting included before a defined(OS_WIN) check.
Review URL: http://codereview.chromium.org/18414
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@8308 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/views/background.cc')
| -rw-r--r-- | chrome/views/background.cc | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/chrome/views/background.cc b/chrome/views/background.cc index 1aa631e..056e511 100644 --- a/chrome/views/background.cc +++ b/chrome/views/background.cc @@ -59,16 +59,24 @@ class BackgroundPainter : public Background { DISALLOW_EVIL_CONSTRUCTORS(BackgroundPainter); }; -Background::Background() : native_control_brush_(NULL) { +Background::Background() +#if defined(OS_WIN) + : native_control_brush_(NULL) +#endif +{ } Background::~Background() { +#if defined(OS_WIN) DeleteObject(native_control_brush_); +#endif } void Background::SetNativeControlColor(SkColor color) { +#if defined(OS_WIN) DeleteObject(native_control_brush_); native_control_brush_ = CreateSolidBrush(skia::SkColorToCOLORREF(color)); +#endif } //static |