Update avatar button to MD (part 1)

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

 // Copyright (c) 2012 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/minimize_button_metrics_win.h"
 
 #include "base/i18n/rtl.h"
 #include "base/logging.h"
 #include "base/win/windows_version.h"
 #include "dwmapi.h"
@@ skipping 36 matching lines @@
 MinimizeButtonMetrics::MinimizeButtonMetrics()
     : hwnd_(nullptr),
       cached_minimize_button_x_delta_(last_cached_minimize_button_x_delta_),
       was_activated_(false) {
 }
 
 MinimizeButtonMetrics::~MinimizeButtonMetrics() {
 }
 
 // static
+int MinimizeButtonMetrics::GetCaptionButtonWidthInDIPs() {
+  return GetCaptionButtonDimensionInDIPs(SM_CXSIZE, SM_CXSIZEFRAME);

[Peter Kasting, 2017/05/11 01:03:43]

It somewhat surprises me that the width would need to include CXSIZEFRAME, since
the non-close caption buttons aren't next to the frame.  But I believe you...

[emx, 2017/05/11 12:56:11]

Me too! In fact, I've measured it carefully again and found that even with
CXSIZEFRAME the width is still too small. I've gone back to a hardcoded value
for this (46), since I can't find a way to get the correct value from Windows,
but tell me if you have any ideas! See
https://docs.google.com/a/google.com/spreadsheets/d/1q4q8RWRp8K-S6fakxjg8tWdD...

I think a 1 px mismatch here won't be as bad as for height where the user can
see the difference due to the buttons being side by side.

+}
+
+// static
 int MinimizeButtonMetrics::GetCaptionButtonHeightInDIPs() {
+  return GetCaptionButtonDimensionInDIPs(SM_CYSIZE, SM_CYSIZEFRAME);
+}
+
+// static
+int MinimizeButtonMetrics::GetCaptionButtonDimensionInDIPs(int caption_metric,
+                                                           int frame_metric) {
   // At DPI scaling settings other than 100% the result won't be exactly right.
   // TODO: return a more accurate approximation [http://crbug.com/716365]
 
-  // SM_CYSIZE returns the caption button height, but to get the full height
-  // from the top of the window we add SM_CYSIZEFRAME.
-  const int caption_height = GetSystemMetrics(SM_CYSIZE);
-  const int frame_thickness = GetSystemMetrics(SM_CYSIZEFRAME);
+  // SM_CXSIZE/SM_CYSIZE return the caption button width/height, but to get the
+  // full width from the side/height from the top of the window we add
+  // SM_CXSIZEFRAME/SM_CYSIZEFRAME.
+  const int caption_dimension = GetSystemMetrics(caption_metric);
+  const int frame_thickness = GetSystemMetrics(frame_metric);
 
   // The result of GetSystemMetrics depends on the scale factor of the primary
-  // display. Divide the sum by that to convert to DIPs. (Converting SM_CYSIZE
-  // and SM_CYSIZEFRAME to DIPs individually adds a bigger rounding error.)
+  // display. Divide the sum by that to convert to DIPs. (Converting the two
+  // metrics to DIPs individually adds a bigger rounding error.)
   float primary_device_scale_factor =
       display::Screen::GetScreen()->GetPrimaryDisplay().device_scale_factor();
-  float height_dips =
-      (caption_height + frame_thickness) / primary_device_scale_factor;
+  float dimension_dips =
+      (caption_dimension + frame_thickness) / primary_device_scale_factor;
 
   // Testing shows that floor() gives a more accurate approximation than
   // round() here.
-  return std::floor(height_dips);
+  return std::floor(dimension_dips);
 }
 
 void MinimizeButtonMetrics::Init(HWND hwnd) {
   DCHECK(!hwnd_);
   hwnd_ = hwnd;
 }
 
 void MinimizeButtonMetrics::OnHWNDActivated() {
   was_activated_ = true;
   // NOTE: we don't cache here as it seems only after the activate is the value
@@ skipping 119 matching lines @@
     cached_minimize_button_x_delta_ = minimize_button_offset;
   } else {
     RECT client_rect = {0};
     GetClientRect(hwnd_, &client_rect);
     cached_minimize_button_x_delta_ =
         client_rect.right - minimize_button_offset;
   }
   last_cached_minimize_button_x_delta_ = cached_minimize_button_x_delta_;
   return minimize_button_offset;
 }