diff options
| author | glen@chromium.org <glen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-12 00:18:45 +0000 |
|---|---|---|
| committer | glen@chromium.org <glen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-12 00:18:45 +0000 |
| commit | 5cc8b1fbfd0046c9441277190819aaed000ca652 (patch) | |
| tree | df2869efcd3cb5ae34e161c551ae10048808260d /chrome/browser | |
| parent | 7d0fade425ef78dda741b1b1a34094cc5948f8f7 (diff) | |
| download | chromium_src-5cc8b1fbfd0046c9441277190819aaed000ca652.zip chromium_src-5cc8b1fbfd0046c9441277190819aaed000ca652.tar.gz chromium_src-5cc8b1fbfd0046c9441277190819aaed000ca652.tar.bz2 | |
Draw the maximized frame background correctly.
BUG=11695
Review URL: http://codereview.chromium.org/113227
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@15820 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser')
| -rw-r--r-- | chrome/browser/views/frame/opaque_browser_frame_view.cc | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/chrome/browser/views/frame/opaque_browser_frame_view.cc b/chrome/browser/views/frame/opaque_browser_frame_view.cc index 5a2fb24..3e58d71 100644 --- a/chrome/browser/views/frame/opaque_browser_frame_view.cc +++ b/chrome/browser/views/frame/opaque_browser_frame_view.cc @@ -605,10 +605,20 @@ void OpaqueBrowserFrameView::PaintRestoredFrameBorder(ChromeCanvas* canvas) { void OpaqueBrowserFrameView::PaintMaximizedFrameBorder(ChromeCanvas* canvas) { ThemeProvider* tp = GetThemeProvider(); + // Window frame mode and color + SkBitmap* theme_frame; + if (!browser_view_->IsOffTheRecord()) { + theme_frame = frame_->IsActive() ? + tp->GetBitmapNamed(IDR_THEME_FRAME) : + tp->GetBitmapNamed(IDR_THEME_FRAME_INACTIVE); + } else { + theme_frame = frame_->IsActive() ? + tp->GetBitmapNamed(IDR_THEME_FRAME_INCOGNITO) : + tp->GetBitmapNamed(IDR_THEME_FRAME_INCOGNITO_INACTIVE); + } - SkBitmap* top_edge = tp->GetBitmapNamed(IDR_WINDOW_TOP_CENTER); - canvas->TileImageInt(*top_edge, 0, FrameBorderThickness(), width(), - top_edge->height()); + // Draw the theme frame. + canvas->TileImageInt(*theme_frame, 0, 0, width(), theme_frame->height()); if (!browser_view_->IsToolbarVisible()) { // There's no toolbar to edge the frame border, so we need to draw a bottom |