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, 11 insertions, 11 deletions

diff --git a/chrome/browser/views/toolbar_view.cc b/chrome/browser/views/toolbar_view.cc
index e2c772f..abbad21 100644
--- a/chrome/browser/views/toolbar_view.cc
+++ b/chrome/browser/views/toolbar_view.cc
@@ -277,11 +277,11 @@ void BrowserToolbarView::Layout() {
     back_->SetBounds(kControlIndent, kControlVertOffset, sz.cx, sz.cy);
 
     forward_->GetPreferredSize(&sz);
-    forward_->SetBounds(back_->GetX() + back_->GetWidth(), kControlVertOffset,
+    forward_->SetBounds(back_->x() + back_->width(), kControlVertOffset,
                         sz.cx, sz.cy);
 
     reload_->GetPreferredSize(&sz);
-    reload_->SetBounds(forward_->GetX() + forward_->GetWidth() +
+    reload_->SetBounds(forward_->x() + forward_->width() +
                            kControlHorizOffset,
                        kControlVertOffset, sz.cx, sz.cy);
 
@@ -294,11 +294,11 @@ void BrowserToolbarView::Layout() {
       sz = CSize(0, 0);
       home_->SetVisible(false);
     }
-    home_->SetBounds(reload_->GetX() + reload_->GetWidth() + offset,
+    home_->SetBounds(reload_->x() + reload_->width() + offset,
                      kControlVertOffset, sz.cx, sz.cy);
 
     star_->GetPreferredSize(&sz);
-    star_->SetBounds(home_->GetX() + home_->GetWidth() + kControlHorizOffset,
+    star_->SetBounds(home_->x() + home_->width() + kControlHorizOffset,
                      kControlVertOffset, sz.cx, sz.cy);
 
     page_menu_->GetPreferredSize(&sz);
@@ -311,7 +311,7 @@ void BrowserToolbarView::Layout() {
     location_bar_height = sz.cy;
     right_side_width += sz.cx;
 
-    left_side_width = star_->GetX() + star_->GetWidth();
+    left_side_width = star_->x() + star_->width();
   } else {
     CSize temp;
     location_bar_->GetPreferredSize(&temp);
@@ -322,20 +322,20 @@ void BrowserToolbarView::Layout() {
   }
 
   location_bar_->SetBounds(left_side_width, location_bar_y,
-                           GetWidth() - left_side_width - right_side_width,
+                           width() - left_side_width - right_side_width,
                            location_bar_height);
 
   if (IsDisplayModeNormal()) {
-    go_->SetBounds(location_bar_->GetX() + location_bar_->GetWidth(),
+    go_->SetBounds(location_bar_->x() + location_bar_->width(),
                    kControlVertOffset, sz.cx, sz.cy);
 
     // Make sure the Page menu never overlaps the location bar.
-    int page_x = go_->GetX() + go_->GetWidth() + kMenuButtonOffset;
+    int page_x = go_->x() + go_->width() + kMenuButtonOffset;
     page_menu_->GetPreferredSize(&sz);
-    page_menu_->SetBounds(page_x, kControlVertOffset, sz.cx, go_->GetHeight());
+    page_menu_->SetBounds(page_x, kControlVertOffset, sz.cx, go_->height());
     app_menu_->GetPreferredSize(&sz);
-    app_menu_->SetBounds(page_menu_->GetX() + page_menu_->GetWidth(),
-                         page_menu_->GetY(), sz.cx, go_->GetHeight());
+    app_menu_->SetBounds(page_menu_->x() + page_menu_->width(),
+                         page_menu_->y(), sz.cx, go_->height());
   }
 }