Add GetCaptionButtonHeightInDIPs() method

chrome/browser/ui/views/profiles/win10_native_avatar_button.cc

 // Copyright 2017 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/profiles/win10_native_avatar_button.h"
 
 #include "chrome/app/vector_icons/vector_icons.h"
+#include "chrome/browser/ui/views/frame/minimize_button_metrics_win.h"
 #include "chrome/browser/ui/views/tabs/tab_strip.h"
 #include "ui/gfx/paint_vector_icon.h"
 #include "ui/views/animation/flood_fill_ink_drop_ripple.h"
 #include "ui/views/animation/ink_drop_impl.h"
 #include "ui/views/border.h"
 #include "ui/views/painter.h"
 
 const int kButtonMinWidth = 48;
 const int kButtonMaxWidth = 96;
 // Height of the "cozy" MD button that slides over the tabstrip
@@ skipping 26 matching lines @@
   set_ink_drop_base_color(SK_ColorBLACK);
   set_ink_drop_visible_opacity(kRippleInkDropOpacity);
 }
 
 Win10NativeAvatarButton::~Win10NativeAvatarButton() {}
 
 gfx::Size Win10NativeAvatarButton::GetPreferredSize() const {
   gfx::Size ps = views::MenuButton::GetPreferredSize();
   ps.set_width(
       std::min(std::max(ps.width(), kButtonMinWidth), kButtonMaxWidth));
-  // TODO(emx): get the proper height here - see http://crrev/2833363002
-  ps.set_height(30);
+  ps.set_height(MinimizeButtonMetrics::GetCaptionButtonHeightInDIPs());
   return ps;
 }
 
 std::unique_ptr<views::Border> Win10NativeAvatarButton::CreateBorder() const {
   // These insets look OK at 100%, 125%, 150%, 175% and 200% scaling.
   const int kLeftRightInset = 8;
   const int kTopInset = 1;
   const int kBottomInset = 3;
   return views::CreateEmptyBorder(kTopInset, kLeftRightInset, kBottomInset,
                                   kLeftRightInset);
@@ skipping 29 matching lines @@
   // In RTL the new tab button is on the left, so it can never slide under the
   // avatar button (which is still on the right). May as well use the space.
   if (base::i18n::IsRTL())
     return;
 
   // Use the "cozy" button if the tabstrip can slide under it
   if (tab_strip->max_x() >= button_x) {
     *button_height = kButtonCozyHeight;
   }
 }