summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoraa@chromium.org <aa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-05-03 22:21:18 +0000
committeraa@chromium.org <aa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-05-03 22:21:18 +0000
commitb53c5fca4e029639a07745750023096a6090aae3 (patch)
tree20b784d82b690f3e4edc9bdcadcff1397014b538
parent09e0a25227433d943c499e9e3b11122df67a9efc (diff)
downloadchromium_src-b53c5fca4e029639a07745750023096a6090aae3.zip
chromium_src-b53c5fca4e029639a07745750023096a6090aae3.tar.gz
chromium_src-b53c5fca4e029639a07745750023096a6090aae3.tar.bz2
Fix regression in position of OTR icon.
BUG=43099 TEST=visual inspection Review URL: http://codereview.chromium.org/1839004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@46290 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/views/frame/opaque_browser_frame_view.cc4
1 files changed, 4 insertions, 0 deletions
diff --git a/chrome/browser/views/frame/opaque_browser_frame_view.cc b/chrome/browser/views/frame/opaque_browser_frame_view.cc
index 3b92e3b..6380fda 100644
--- a/chrome/browser/views/frame/opaque_browser_frame_view.cc
+++ b/chrome/browser/views/frame/opaque_browser_frame_view.cc
@@ -1001,6 +1001,10 @@ void OpaqueBrowserFrameView::LayoutTitleBar() {
void OpaqueBrowserFrameView::LayoutOTRAvatar() {
int top_height = NonClientTopBorderHeight();
+ if (!frame_->GetWindow()->IsMaximized() &&
+ !frame_->GetWindow()->IsFullscreen()) {
+ top_height += kNonClientRestoredExtraThickness;
+ }
int tabstrip_height, otr_height;
bool visible = browser_view_->ShouldShowOffTheRecordAvatar();
gfx::Size preferred_size = otr_avatar_icon_->GetPreferredSize();