[Win] UI fixes for the new avatar button/bubble auth errors.

chrome/browser/ui/views/frame/glass_browser_frame_view.cc

Index: chrome/browser/ui/views/frame/glass_browser_frame_view.cc
diff --git a/chrome/browser/ui/views/frame/glass_browser_frame_view.cc b/chrome/browser/ui/views/frame/glass_browser_frame_view.cc
index 1402b157bcf56ab927d9f5585652ac2faa61d94f..f8d119448d0ee20f3f62fe310177fd62cedbe023 100644
--- a/chrome/browser/ui/views/frame/glass_browser_frame_view.cc
+++ b/chrome/browser/ui/views/frame/glass_browser_frame_view.cc
@@ -447,25 +447,25 @@ void GlassBrowserFrameView::LayoutNewStyleAvatar() {
     return;
 
   gfx::Size label_size = new_avatar_button()->GetPreferredSize();
-  int button_size_with_offset = kNewAvatarButtonOffset + label_size.width();
 
   int button_x = frame()->GetMinimizeButtonOffset() -
       kNewAvatarButtonOffset - label_size.width();
   if (base::i18n::IsRTL())
     button_x = width() - frame()->GetMinimizeButtonOffset() +
         kNewAvatarButtonOffset;
-  int button_y = frame()->IsMaximized() ? NonClientTopBorderHeight() : 1;
 
-  // If the window is maximized, the button is 2 pixels too tall. Determined
-  // via visual inspection.
-  int height_to_subtract = frame()->IsMaximized() ? 2 : 0;
+  // We need to offset the button correctly in maximized mode, so that the
+  // custom glass style aligns with the native control glass style. The
+  // glass shadow is off by 1px, which was determined by visual inspection.
+  const int maximized_frame_offset =
+      NonClientTopBorderHeight() + kTabstripTopShadowThickness - 1;

[msw, 2014/06/19 04:10:17]

optional nit: inline this below (and negate the ternary conditional?).

[noms (inactive), 2014/06/19 15:10:55]

Done.

+  int button_y = frame()->IsMaximized() ? maximized_frame_offset : 1;
 
   new_avatar_button()->SetBounds(
       button_x,
       button_y,
       label_size.width(),
-      button_y + gfx::win::GetSystemMetricsInDIP(SM_CXMENUSIZE) -
-          height_to_subtract);
+      gfx::win::GetSystemMetricsInDIP(SM_CYMENUSIZE) + 1);
 }
 
 void GlassBrowserFrameView::LayoutAvatar() {