diff options
author | mirandac@chromium.org <mirandac@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-03 19:37:31 +0000 |
---|---|---|
committer | mirandac@chromium.org <mirandac@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-03 19:37:31 +0000 |
commit | 1bfb971ff8bd586625d435d4a95592b0b532eab3 (patch) | |
tree | 9ed4b25c042c70719374f30623d89f44b0113b9f /chrome/browser/ui | |
parent | 8d2f82798c1798f9fd85c425b188944564852658 (diff) | |
download | chromium_src-1bfb971ff8bd586625d435d4a95592b0b532eab3.zip chromium_src-1bfb971ff8bd586625d435d4a95592b0b532eab3.tar.gz chromium_src-1bfb971ff8bd586625d435d4a95592b0b532eab3.tar.bz2 |
Fix Mac theme overlay for popup Windows to be identical w/Win and Linux (no overlay).
BUG=84340
TEST=Apply glossy blue theme on Mac. Open popup window. No jarring overlay image in upper left corner.
Review URL: http://codereview.chromium.org/6993029
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@87832 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ui')
-rw-r--r-- | chrome/browser/ui/cocoa/browser_frame_view.mm | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/chrome/browser/ui/cocoa/browser_frame_view.mm b/chrome/browser/ui/cocoa/browser_frame_view.mm index 74fe110..41d7838 100644 --- a/chrome/browser/ui/cocoa/browser_frame_view.mm +++ b/chrome/browser/ui/cocoa/browser_frame_view.mm @@ -279,7 +279,8 @@ static BOOL gCanGetCornerRadius = NO; // Check to see if we have an overlay image. NSImage* overlayImage = nil; - if (themeProvider->HasCustomImage(IDR_THEME_FRAME_OVERLAY) && !incognito) { + if (themeProvider->HasCustomImage(IDR_THEME_FRAME_OVERLAY) && !incognito && + !popup) { overlayImage = themeProvider-> GetNSImageNamed(active ? IDR_THEME_FRAME_OVERLAY : IDR_THEME_FRAME_OVERLAY_INACTIVE, |