summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-08-11 17:30:08 +0000
committertc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-08-11 17:30:08 +0000
commit822762da239d0443ca82d197593fb3e2df05a37f (patch)
tree58fb33b8e672e72ebd94f85d418fbf5eb426536f
parent9c3478d3127be674373099465c481224fcc3a302 (diff)
downloadchromium_src-822762da239d0443ca82d197593fb3e2df05a37f.zip
chromium_src-822762da239d0443ca82d197593fb3e2df05a37f.tar.gz
chromium_src-822762da239d0443ca82d197593fb3e2df05a37f.tar.bz2
Fix the theme overlay when the window is maximized and inactive. We
were drawing the active overlay. TEST=Install the Zen Spring theme, maximize chrome, and select a different window. The overlay should be dimmed. Review URL: http://codereview.chromium.org/164271 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@23041 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/views/frame/opaque_browser_frame_view.cc4
1 files changed, 3 insertions, 1 deletions
diff --git a/chrome/browser/views/frame/opaque_browser_frame_view.cc b/chrome/browser/views/frame/opaque_browser_frame_view.cc
index 43106c8..0332a67 100644
--- a/chrome/browser/views/frame/opaque_browser_frame_view.cc
+++ b/chrome/browser/views/frame/opaque_browser_frame_view.cc
@@ -697,7 +697,9 @@ void OpaqueBrowserFrameView::PaintMaximizedFrameBorder(gfx::Canvas* canvas) {
// Draw the theme frame overlay
if (tp->HasCustomImage(IDR_THEME_FRAME_OVERLAY) &&
browser_view_->IsBrowserTypeNormal()) {
- SkBitmap* theme_overlay = tp->GetBitmapNamed(IDR_THEME_FRAME_OVERLAY);
+ SkBitmap* theme_overlay = frame_->GetWindow()->IsActive() ?
+ tp->GetBitmapNamed(IDR_THEME_FRAME_OVERLAY) :
+ tp->GetBitmapNamed(IDR_THEME_FRAME_OVERLAY_INACTIVE);
canvas->DrawBitmapInt(*theme_overlay, 0, 0);
}