diff options
| author | jhawkins@chromium.org <jhawkins@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-24 02:13:03 +0000 |
|---|---|---|
| committer | jhawkins@chromium.org <jhawkins@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-24 02:13:03 +0000 |
| commit | ee5df73d73484092c8852343f54a4c387a12e16d (patch) | |
| tree | b680f3d93567b821df220bea634dc593c33498fa /chrome/browser/views/frame | |
| parent | f9641a033c5553324622d65c2452b24a1a192c37 (diff) | |
| download | chromium_src-ee5df73d73484092c8852343f54a4c387a12e16d.zip chromium_src-ee5df73d73484092c8852343f54a4c387a12e16d.tar.gz chromium_src-ee5df73d73484092c8852343f54a4c387a12e16d.tar.bz2 | |
windows: Theme the popup window with the incognito theme when we are in the incognito mode.
BUG=20373
TEST=see bug
Patch by Thiago Farina <thiago.farina@gmail.com>
Original review at http://codereview.chromium.org/606060
Review URL: http://codereview.chromium.org/657042
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@39844 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/views/frame')
| -rw-r--r-- | chrome/browser/views/frame/opaque_browser_frame_view.cc | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/chrome/browser/views/frame/opaque_browser_frame_view.cc b/chrome/browser/views/frame/opaque_browser_frame_view.cc index d132420..3313579 100644 --- a/chrome/browser/views/frame/opaque_browser_frame_view.cc +++ b/chrome/browser/views/frame/opaque_browser_frame_view.cc @@ -594,14 +594,18 @@ void OpaqueBrowserFrameView::PaintRestoredFrameBorder(gfx::Canvas* canvas) { // Never theme app and popup windows. if (!browser_view_->IsBrowserTypeNormal()) { ResourceBundle& rb = ResourceBundle::GetSharedInstance(); + bool is_off_the_record = browser_view_->IsOffTheRecord(); if (ShouldPaintAsActive()) { - theme_frame = rb.GetBitmapNamed(IDR_FRAME); - frame_color = browser_view_->IsOffTheRecord() ? + theme_frame = rb.GetBitmapNamed(is_off_the_record ? + IDR_THEME_FRAME_INCOGNITO : IDR_FRAME); + frame_color = is_off_the_record ? ResourceBundle::frame_color_incognito : ResourceBundle::frame_color; } else { - theme_frame = rb.GetBitmapNamed(IDR_THEME_FRAME_INACTIVE); - frame_color = browser_view_->IsOffTheRecord() ? + theme_frame = rb.GetBitmapNamed(is_off_the_record ? + IDR_THEME_FRAME_INCOGNITO_INACTIVE : + IDR_THEME_FRAME_INACTIVE); + frame_color = is_off_the_record ? ResourceBundle::frame_color_incognito_inactive : ResourceBundle::frame_color_inactive; } |