OpaqueNonClientView cleanup

chrome/views/custom_frame_window.cc

 // Copyright (c) 2006-2008 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/views/custom_frame_window.h"
 
 #include "base/gfx/point.h"
 #include "base/gfx/size.h"
 #include "base/win_util.h"
 #include "chrome/app/theme/theme_resources.h"
@@ skipping 378 matching lines @@
                                                           int height) const {
   int top_margin = CalculateContentsTop();
   return gfx::Rect(kWindowHorizontalBorderSize, top_margin,
       std::max(0, width - (2 * kWindowHorizontalBorderSize)),
       std::max(0, height - top_margin - kWindowVerticalBorderSize));
 }
 
 gfx::Size DefaultNonClientView::CalculateWindowSizeForClientSize(
     int width,
     int height) const {
-  int contents_top = CalculateContentsTop();
   return gfx::Size(width + (2 * kWindowHorizontalBorderSize),
                    height + CalculateContentsTop() + kWindowVerticalBorderSize);
 }
 
 CPoint DefaultNonClientView::GetSystemMenuPoint() const {
   CPoint system_menu_point(
       system_menu_button_->x(),
       system_menu_button_->y() + system_menu_button_->height());
   MapWindowPoints(container_->GetHWND(), HWND_DESKTOP, &system_menu_point, 1);
   return system_menu_point;
@@ skipping 30 matching lines @@
   if (button_bounds.Contains(point))
     return HTMAXBUTTON;
   button_bounds = minimize_button_->GetBounds(APPLY_MIRRORING_TRANSFORMATION);
   if (button_bounds.Contains(point))
     return HTMINBUTTON;
   button_bounds =
       system_menu_button_->GetBounds(APPLY_MIRRORING_TRANSFORMATION);
   if (button_bounds.Contains(point))
     return HTSYSMENU;
 
-  component = GetHTComponentForFrame(
-      point,
-      kResizeAreaSize,
-      kResizeAreaCornerSize,
-      kResizeAreaNorthSize,
+  component = GetHTComponentForFrame(point, kResizeAreaNorthSize,
+      kResizeAreaSize, kResizeAreaSize, kResizeAreaCornerSize,
       container_->window_delegate()->CanResize());
   if (component == HTNOWHERE) {
     // Finally fall back to the caption.
     if (bounds().Contains(point))
       component = HTCAPTION;
     // Otherwise, the point is outside the window's bounds.
   }
   return component;
 }
 
@@ skipping 847 matching lines @@
   if ((GetKeyState(VK_CONTROL) & 0x80) == 0x80)
     message_flags |= MK_CONTROL;
   if ((GetKeyState(VK_SHIFT) & 0x80) == 0x80)
     message_flags |= MK_SHIFT;
   message_flags |= flags;
   ProcessMousePressed(temp, message_flags, false);
 }
 
 }  // namespace views