[Win] Fix the size of the themed new avatar button with the new assets

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

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/views/frame/opaque_browser_frame_view_layout.h"
 
 #include "base/command_line.h"
 #include "chrome/browser/profiles/profiles_state.h"
 #include "chrome/browser/ui/views/profiles/avatar_label.h"
 #include "chrome/browser/ui/views/profiles/avatar_menu_button.h"
@@ skipping 369 matching lines @@
 void OpaqueBrowserFrameViewLayout::LayoutNewStyleAvatar(views::View* host) {
   DCHECK(switches::IsNewAvatarMenu());
   if (!new_avatar_button_)
     return;
 
   gfx::Size label_size = new_avatar_button_->GetPreferredSize();
   int button_size_with_offset = kNewAvatarButtonOffset + label_size.width();
 
   int button_x = host->width() - trailing_button_start_ -
       button_size_with_offset;
-  int button_y = CaptionButtonY(false);
-  // If the window is maximized, the button is 1 pixel too short. Determined
-  // via visual inspection.
-  int extra_height = IsTitleBarCondensed() ? 1 : 0;
+  int button_y = CaptionButtonY(!IsTitleBarCondensed());
 
   trailing_button_start_ += button_size_with_offset;
   minimum_size_for_buttons_ += button_size_with_offset;
 
+  // |kCaptionButtonHeightWithPadding| adds a 1px padding to the height

[msw, 2014/08/12 21:22:56]

Clarify why the 1px matters or remove the comment if it's not pertinent.

[noms (inactive), 2014/08/12 21:44:47]

The comment at the top of the file for kCaptionButtonHeightWithPadding says that
it "adds some padding padding below it", and I've verified that the size of the
caption resources is 18px. I can create kCaptionButtonHeight, but that might be
an overkill. 

Also I forgot to actually include the -1 which is why the comment is there. This
CL is kryptonite.

On 2014/08/12 21:22:56, msw wrote:

+  // of the button.
   new_avatar_button_->SetBounds(
       button_x,

[msw, 2014/08/12 21:22:56]

nit: move this to the line above, indent others to match.

[noms (inactive), 2014/08/12 21:44:47]

Done.

       button_y,
       label_size.width(),
-      button_y + kCaptionButtonHeightWithPadding + extra_height);
+      kCaptionButtonHeightWithPadding);
 }
 
 void OpaqueBrowserFrameViewLayout::LayoutAvatar(views::View* host) {
   // Even though the avatar is used for both incognito and profiles we always
   // use the incognito icon to layout the avatar button. The profile icon
   // can be customized so we can't depend on its size to perform layout.
   gfx::ImageSkia incognito_icon = delegate_->GetOTRAvatarIcon();
 
   bool avatar_on_right = ShouldAvatarBeOnRight();
   int avatar_bottom = GetTabStripInsetsTop(false) +
@@ skipping 272 matching lines @@
 
 void OpaqueBrowserFrameViewLayout::ViewAdded(views::View* host,
                                              views::View* view) {
   SetView(view->id(), view);
 }
 
 void OpaqueBrowserFrameViewLayout::ViewRemoved(views::View* host,
                                                views::View* view) {
   SetView(view->id(), NULL);
 }