Fix the black patch which would appear at the top of app windows in Chrome desktop windows with HiD…

chrome/browser/ui/views/apps/glass_app_window_frame_view_win.cc

 // Copyright 2014 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/apps/glass_app_window_frame_view_win.h"
 
 #include "apps/ui/native_app_window.h"
 #include "ui/base/hit_test.h"
+#include "ui/gfx/win/dpi.h"
 #include "ui/views/widget/widget.h"
 #include "ui/views/widget/widget_delegate.h"
 
 namespace {
 
 const int kResizeAreaCornerSize = 16;
 
 }  // namespace
 
 const char GlassAppWindowFrameViewWin::kViewClassName[] =
     "ui/views/apps/GlassAppWindowFrameViewWin";
 
 GlassAppWindowFrameViewWin::GlassAppWindowFrameViewWin(
     apps::NativeAppWindow* window,
     views::Widget* widget)
     : window_(window), widget_(widget) {
 }
 
 GlassAppWindowFrameViewWin::~GlassAppWindowFrameViewWin() {
 }
 
 gfx::Insets GlassAppWindowFrameViewWin::GetGlassInsets() const {
   // If 1 is not subtracted, they are too big. There is possibly some reason
   // for that.
   // Also make sure the insets don't go below 1, as bad things happen when they
   // do.
-  int caption_height = std::max(
-      0, GetSystemMetrics(SM_CYSMICON) + GetSystemMetrics(SM_CYSIZEFRAME) - 1);
-  int frame_size = std::max(1, GetSystemMetrics(SM_CXSIZEFRAME) - 1);
+  int caption_height = std::max(0,
+      gfx::win::GetSystemMetricsInDIP(SM_CYSMICON) +
+          gfx::win::GetSystemMetricsInDIP(SM_CYSIZEFRAME) - 1);
+  int frame_size =
+      std::max(1, gfx::win::GetSystemMetricsInDIP(SM_CXSIZEFRAME) - 1);
   return gfx::Insets(
       frame_size + caption_height, frame_size, frame_size, frame_size);
 }
 
 gfx::Rect GlassAppWindowFrameViewWin::GetBoundsForClientView() const {
   if (widget_->IsFullscreen())
     return bounds();
 
   gfx::Insets insets = GetGlassInsets();
   return gfx::Rect(insets.left(),
@@ skipping 18 matching lines @@
   if (!bounds().Contains(point))
     return HTNOWHERE;
 
   // Check the frame first, as we allow a small area overlapping the contents
   // to be used for resize handles.
   bool can_ever_resize = widget_->widget_delegate()
                              ? widget_->widget_delegate()->CanResize()
                              : false;
   // Don't allow overlapping resize handles when the window is maximized or
   // fullscreen, as it can't be resized in those states.
-  int resize_border = GetSystemMetrics(SM_CXSIZEFRAME);
+  int resize_border = gfx::win::GetSystemMetricsInDIP(SM_CXSIZEFRAME);
   int frame_component =
       GetHTComponentForFrame(point,
                              resize_border,
                              resize_border,
                              kResizeAreaCornerSize - resize_border,
                              kResizeAreaCornerSize - resize_border,
                              can_ever_resize);
   if (frame_component != HTNOWHERE)
     return frame_component;
 
@@ skipping 34 matching lines @@
 
   // Add to the client maximum size the height of any title bar and borders.
   gfx::Size client_size = GetBoundsForClientView().size();
   if (max_size.width())
     max_size.Enlarge(width() - client_size.width(), 0);
   if (max_size.height())
     max_size.Enlarge(0, height() - client_size.height());
 
   return max_size;
 }