Rename legacy methods that were in CamelCase to unix_hacker.

Required going through and modifying some of the code to 
solve name clashes.

Review URL: http://codereview.chromium.org/2945

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@2337 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 8 insertions, 10 deletions

diff --git a/chrome/views/non_client_view.cc b/chrome/views/non_client_view.cc
index 661367a..ff91dff 100644
--- a/chrome/views/non_client_view.cc
+++ b/chrome/views/non_client_view.cc
@@ -11,13 +11,11 @@ int NonClientView::GetHTComponentForFrame(const gfx::Point& point,
                                           int resize_area_corner_size,
                                           int top_resize_area_size,
                                           bool can_resize) {
-  int width = GetWidth();
-  int height = GetHeight();
   int component = HTNOWHERE;
   if (point.x() < resize_area_size) {
     if (point.y() < resize_area_corner_size) {
       component = HTTOPLEFT;
-    } else if (point.y() >= (height - resize_area_corner_size)) {
+    } else if (point.y() >= (height() - resize_area_corner_size)) {
       component = HTBOTTOMLEFT;
     } else {
       component = HTLEFT;
@@ -25,26 +23,26 @@ int NonClientView::GetHTComponentForFrame(const gfx::Point& point,
   } else if (point.x() < resize_area_corner_size) {
     if (point.y() < top_resize_area_size) {
       component = HTTOPLEFT;
-    } else if (point.y() >= (height - resize_area_size)) {
+    } else if (point.y() >= (height() - resize_area_size)) {
       component = HTBOTTOMLEFT;
     }
-  } else if (point.x() >= (width - resize_area_size)) {
+  } else if (point.x() >= (width() - resize_area_size)) {
     if (point.y() < resize_area_corner_size) {
       component = HTTOPRIGHT;
-    } else if (point.y() >= (height - resize_area_corner_size)) {
+    } else if (point.y() >= (height() - resize_area_corner_size)) {
       component = HTBOTTOMRIGHT;
-    } else if (point.x() >= (width - resize_area_size)) {
+    } else if (point.x() >= (width() - resize_area_size)) {
       component = HTRIGHT;
     }
-  } else if (point.x() >= (width - resize_area_corner_size)) {
+  } else if (point.x() >= (width() - resize_area_corner_size)) {
     if (point.y() < top_resize_area_size) {
       component = HTTOPRIGHT;
-    } else if (point.y() >= (height - resize_area_size)) {
+    } else if (point.y() >= (height() - resize_area_size)) {
       component = HTBOTTOMRIGHT;
     }
   } else if (point.y() < top_resize_area_size) {
     component = HTTOP;
-  } else if (point.y() >= (height - resize_area_size)) {
+  } else if (point.y() >= (height() - resize_area_size)) {
     component = HTBOTTOM;
   }