Add SM_CXSIZEFRAME and SM_CXPADDEDBORDER metrics to get window border size.

chrome/browser/ui/views/frame/browser_desktop_window_tree_host_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/browser_desktop_window_tree_host_win.h"
 
 #include <dwmapi.h>
 
 #include "chrome/browser/lifetime/application_lifetime.h"
 #include "chrome/browser/themes/theme_service.h"
@@ skipping 125 matching lines @@
 
 bool BrowserDesktopWindowTreeHostWin::GetClientAreaInsets(
     gfx::Insets* insets) const {
   // Use the default client insets for an opaque frame or a glass popup/app
   // frame.
   if (!GetWidget()->ShouldUseNativeFrame() ||
       !browser_view_->IsBrowserTypeNormal()) {
     return false;
   }
 
-  int border_thickness = GetSystemMetrics(SM_CXSIZEFRAME);
+  int border_thickness =
+      GetSystemMetrics(SM_CXSIZEFRAME) + GetSystemMetrics(SM_CXPADDEDBORDER);
   // In fullscreen mode, we have no frame. In restored mode, we draw our own
   // client edge over part of the default frame.
   if (GetWidget()->IsFullscreen())
     border_thickness = 0;
   else if (!IsMaximized())
     border_thickness -= kClientEdgeThickness;
   insets->Set(0, border_thickness, border_thickness, border_thickness);
   return true;
 }
 
@@ skipping 171 matching lines @@
     BrowserDesktopWindowTreeHost::CreateBrowserDesktopWindowTreeHost(
         views::internal::NativeWidgetDelegate* native_widget_delegate,
         views::DesktopNativeWidgetAura* desktop_native_widget_aura,
         BrowserView* browser_view,
         BrowserFrame* browser_frame) {
   return new BrowserDesktopWindowTreeHostWin(native_widget_delegate,
                                              desktop_native_widget_aura,
                                              browser_view,
                                              browser_frame);
 }