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

trunk/src/ui/views/win/hwnd_message_handler.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 "ui/views/win/hwnd_message_handler.h"
 
 #include <dwmapi.h>
 #include <oleacc.h>
 #include <shellapi.h>
 #include <wtsapi32.h>
@@ skipping 1050 matching lines @@
   // Returning false causes the default handling in OnNCCalcSize() to
   // be invoked.
   if (!delegate_->IsWidgetWindow() ||
       (!delegate_->IsUsingCustomFrame() && !remove_standard_frame_)) {
     return false;
   }
 
   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(
         border_thickness, border_thickness, border_thickness, border_thickness);
     return true;
   }
 
   *insets = gfx::Insets();
   return true;
 }
@@ skipping 647 matching lines @@
         hit_test_code = HTCLIENT;
         break;
 
       case HTBOTTOMRIGHT: {
         // Normally the HTBOTTOMRIGHT hittest code is received when we hover
         // near the bottom right of the window. However due to our fake scroll
         // styles, we get this code even when we hover around the area where
         // 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;
         ::GetWindowRect(hwnd(), &window_rect);
         window_rect.bottom -= border_height;
         window_rect.right -= border_width;
         window_rect.left = window_rect.right - scroll_width;
         window_rect.top = window_rect.bottom - scroll_height;
         POINT pt;
         pt.x = point.x();
@@ skipping 445 matching lines @@
         // nVidia's nView desktop manager) the work area can change asynchronous
         // to any notification, and we're just sent a SetWindowPos() call with a
         // new (frequently incorrect) position/size.  In either case, the best
         // response is to throw away the existing position/size information in
         // |window_pos| and recalculate it based on the new work rect.
         gfx::Rect new_window_rect;
         if (fullscreen_handler_->fullscreen()) {
           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);
           new_window_rect.AdjustToFit(work_area);
         }
         window_pos->x = new_window_rect.x();
         window_pos->y = new_window_rect.y();
         window_pos->cx = new_window_rect.width();
         window_pos->cy = new_window_rect.height();
         // WARNING!  Don't set SWP_FRAMECHANGED here, it breaks moving the child
@@ skipping 203 matching lines @@
     POINT cursor_pos = {0};
     ::GetCursorPos(&cursor_pos);
     if (memcmp(&cursor_pos, &mouse_location, sizeof(POINT)))
       return false;
     return true;
   }
   return false;
 }
 
 }  // namespace views