diff options
| author | glen@chromium.org <glen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-24 17:43:03 +0000 |
|---|---|---|
| committer | glen@chromium.org <glen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-24 17:43:03 +0000 |
| commit | 9f3383e1c805f72154ed207e7e1057077cd6170f (patch) | |
| tree | 1d64b7419d2d440d89db853e5dcd0b74b98bfa97 /chrome/browser/views | |
| parent | a32eb53d481cd7474049ed902d0fc707e910946d (diff) | |
| download | chromium_src-9f3383e1c805f72154ed207e7e1057077cd6170f.zip chromium_src-9f3383e1c805f72154ed207e7e1057077cd6170f.tar.gz chromium_src-9f3383e1c805f72154ed207e7e1057077cd6170f.tar.bz2 | |
Fix frame overlay display in incognito mode, make location bar background follow theme tinting.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/159340
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@21545 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/views')
| -rw-r--r-- | chrome/browser/views/frame/opaque_browser_frame_view.cc | 6 | ||||
| -rw-r--r-- | chrome/browser/views/location_bar_view.cc | 5 |
2 files changed, 9 insertions, 2 deletions
diff --git a/chrome/browser/views/frame/opaque_browser_frame_view.cc b/chrome/browser/views/frame/opaque_browser_frame_view.cc index e652925..5a2f061 100644 --- a/chrome/browser/views/frame/opaque_browser_frame_view.cc +++ b/chrome/browser/views/frame/opaque_browser_frame_view.cc @@ -600,7 +600,11 @@ void OpaqueBrowserFrameView::PaintRestoredFrameBorder(gfx::Canvas* canvas) { // Draw the theme frame overlay if (tp->HasCustomImage(IDR_THEME_FRAME_OVERLAY)) { - SkBitmap* theme_overlay = tp->GetBitmapNamed(IDR_THEME_FRAME_OVERLAY); + SkBitmap* theme_overlay; + if (frame_->GetWindow()->IsActive()) + theme_overlay = tp->GetBitmapNamed(IDR_THEME_FRAME_OVERLAY); + else + theme_overlay = tp->GetBitmapNamed(IDR_THEME_FRAME_OVERLAY_INACTIVE); canvas->DrawBitmapInt(*theme_overlay, 0, 0); } diff --git a/chrome/browser/views/location_bar_view.cc b/chrome/browser/views/location_bar_view.cc index 43d588e..e32d4a97 100644 --- a/chrome/browser/views/location_bar_view.cc +++ b/chrome/browser/views/location_bar_view.cc @@ -277,7 +277,10 @@ void LocationBarView::Paint(gfx::Canvas* canvas) { SkColor bg = kBackgroundColorByLevel[model_->GetSchemeSecurityLevel()]; const SkBitmap* background = - popup_window_mode_ ? kPopupBackground : kBackground; + popup_window_mode_ ? + kPopupBackground : + GetThemeProvider()->GetBitmapNamed(IDR_LOCATIONBG); + canvas->TileImageInt(*background, 0, 0, 0, 0, width(), height()); int top_margin = TopMargin(); canvas->FillRectInt(bg, 0, top_margin, width(), |