Revert 265329 "Add SM_CXSIZEFRAME and SM_CXPADDEDBORDER metrics ..."

trunk/src/ui/views/win/hwnd_message_handler.cc

Index: trunk/src/ui/views/win/hwnd_message_handler.cc
===================================================================
--- trunk/src/ui/views/win/hwnd_message_handler.cc	(revision 275260)
+++ trunk/src/ui/views/win/hwnd_message_handler.cc	(working copy)
@@ -1068,8 +1068,7 @@
   if (IsMaximized()) {
     // Windows automatically adds a standard width border to all sides when a
     // window is maximized.
-    int border_thickness =
-        GetSystemMetrics(SM_CXSIZEFRAME) + GetSystemMetrics(SM_CXPADDEDBORDER);
+    int border_thickness = GetSystemMetrics(SM_CXSIZEFRAME);
     if (remove_standard_frame_)
       border_thickness -= 1;
     *insets = gfx::Insets(
@@ -1737,10 +1736,8 @@
         // the vertical scrollar down arrow would be drawn.
         // We check if the hittest coordinates lie in this region and if yes
         // we return HTCLIENT.
-        int border_width = ::GetSystemMetrics(SM_CXSIZEFRAME) +
-                           GetSystemMetrics(SM_CXPADDEDBORDER);
-        int border_height = ::GetSystemMetrics(SM_CYSIZEFRAME) +
-                            GetSystemMetrics(SM_CXPADDEDBORDER);
+        int border_width = ::GetSystemMetrics(SM_CXSIZEFRAME);
+        int border_height = ::GetSystemMetrics(SM_CYSIZEFRAME);
         int scroll_width = ::GetSystemMetrics(SM_CXVSCROLL);
         int scroll_height = ::GetSystemMetrics(SM_CYVSCROLL);
         RECT window_rect;
@@ -2206,8 +2203,7 @@
           new_window_rect = monitor_rect;
         } else if (IsMaximized()) {
           new_window_rect = work_area;
-          int border_thickness = GetSystemMetrics(SM_CXSIZEFRAME) +
-                                 GetSystemMetrics(SM_CXPADDEDBORDER);
+          int border_thickness = GetSystemMetrics(SM_CXSIZEFRAME);
           new_window_rect.Inset(-border_thickness, -border_thickness);
         } else {
           new_window_rect = gfx::Rect(window_rect);