summaryrefslogtreecommitdiffstats
path: root/views/window
diff options
context:
space:
mode:
authorglen@chromium.org <glen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-05-16 19:16:42 +0000
committerglen@chromium.org <glen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-05-16 19:16:42 +0000
commitf7c6b77779f5608bcd93a9b18cdc169bd5ffd9c4 (patch)
tree59bf9496c8df1ad313365a77b5cc6f0ff97007f3 /views/window
parent9cfc7b494ac159ddb721be6f6de12ccf717d62e4 (diff)
downloadchromium_src-f7c6b77779f5608bcd93a9b18cdc169bd5ffd9c4.zip
chromium_src-f7c6b77779f5608bcd93a9b18cdc169bd5ffd9c4.tar.gz
chromium_src-f7c6b77779f5608bcd93a9b18cdc169bd5ffd9c4.tar.bz2
Paint dialog frames in maxmized view
BUG=12038 TEST=Open the bookmark manager (Ctrl+Shift+B), them maximize it and verify that the titlebar is painted when active and inactive. Review URL: http://codereview.chromium.org/113478 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@16238 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/window')
-rw-r--r--views/window/custom_frame_view.cc9
1 files changed, 6 insertions, 3 deletions
diff --git a/views/window/custom_frame_view.cc b/views/window/custom_frame_view.cc
index 2869c07..35ecb6b 100644
--- a/views/window/custom_frame_view.cc
+++ b/views/window/custom_frame_view.cc
@@ -376,9 +376,12 @@ void CustomFrameView::PaintMaximizedFrameBorder(
gfx::Canvas* canvas) {
ResourceBundle& rb = ResourceBundle::GetSharedInstance();
- SkBitmap* top_edge = rb.GetBitmapNamed(IDR_WINDOW_TOP_CENTER);
- canvas->TileImageInt(*top_edge, 0, FrameBorderThickness(), width(),
- top_edge->height());
+ SkBitmap* theme_frame = frame_->IsActive() ?
+ rb.GetBitmapNamed(IDR_THEME_FRAME) :
+ rb.GetBitmapNamed(IDR_THEME_FRAME_INACTIVE);
+
+ canvas->TileImageInt(*theme_frame, 0, FrameBorderThickness(), width(),
+ theme_frame->height());
// The bottom of the titlebar actually comes from the top of the Client Edge
// graphic, with the actual client edge clipped off the bottom.