diff options
author | mirandac@chromium.org <mirandac@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-26 13:53:33 +0000 |
---|---|---|
committer | mirandac@chromium.org <mirandac@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-26 13:53:33 +0000 |
commit | 68599b91098d3fb997221f9e22b35c8d10ec661c (patch) | |
tree | b59bcf412521907f77bf548519b01ab4707f2855 /chrome | |
parent | d3fe3b27838f4ec1787bec09437a075afcf0a131 (diff) | |
download | chromium_src-68599b91098d3fb997221f9e22b35c8d10ec661c.zip chromium_src-68599b91098d3fb997221f9e22b35c8d10ec661c.tar.gz chromium_src-68599b91098d3fb997221f9e22b35c8d10ec661c.tar.bz2 |
Prevent theme overlay from appearing in maximized incognito windows.
BUg=31742
TEST=current tests all pass. Theme at https://chrome.google.com/webstore/detail/oeljdmeofcikjblcoehpmdnooimalbmj does not display a robot in maxed incognito window.
Review URL: http://codereview.chromium.org/6976024
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@86815 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
-rw-r--r-- | chrome/browser/ui/views/frame/opaque_browser_frame_view.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/chrome/browser/ui/views/frame/opaque_browser_frame_view.cc b/chrome/browser/ui/views/frame/opaque_browser_frame_view.cc index 47ed21c..bc26f6c 100644 --- a/chrome/browser/ui/views/frame/opaque_browser_frame_view.cc +++ b/chrome/browser/ui/views/frame/opaque_browser_frame_view.cc @@ -780,7 +780,8 @@ void OpaqueBrowserFrameView::PaintMaximizedFrameBorder(gfx::Canvas* canvas) { theme_frame->height()); // Draw the theme frame overlay if (tp->HasCustomImage(IDR_THEME_FRAME_OVERLAY) && - browser_view_->IsBrowserTypeNormal()) { + browser_view_->IsBrowserTypeNormal() && + !browser_view_->IsOffTheRecord()) { SkBitmap* theme_overlay = tp->GetBitmapNamed(ShouldPaintAsActive() ? IDR_THEME_FRAME_OVERLAY : IDR_THEME_FRAME_OVERLAY_INACTIVE); canvas->DrawBitmapInt(*theme_overlay, 0, theme_background_y); |