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, 3 insertions, 6 deletions

diff --git a/chrome/browser/views/info_bar_item_view.cc b/chrome/browser/views/info_bar_item_view.cc
index d5b7411..985b1c6 100644
--- a/chrome/browser/views/info_bar_item_view.cc
+++ b/chrome/browser/views/info_bar_item_view.cc
@@ -51,7 +51,7 @@ int InfoBarItemView::CenterPosition(int size, int target_size) {
 }
 
 void InfoBarItemView::GetPreferredSize(CSize* out) {
-  out->cx = GetParent()->GetWidth();
+  out->cx = GetParent()->width();
   out->cy = static_cast<int>(kInfoBarHeight * animation_->GetCurrentValue());
 }
 
@@ -90,11 +90,8 @@ void InfoBarItemView::GetPreferredSize(CSize* out) {
 // left views. Note in this case, the padding appears to the right of the view
 // left aligned view. Removing works the same, but in reverse.
 void InfoBarItemView::Layout() {
-  const int width = GetWidth();
-  const int height = GetHeight();
-
-  int next_x = width - kButtonHEdgeMargin;
-  int height_diff = static_cast<int>(kInfoBarHeight) - height;
+  int next_x = width() - kButtonHEdgeMargin;
+  int height_diff = static_cast<int>(kInfoBarHeight) - height();
   const int child_count = GetChildViewCount();
   // Anything greater than or equal to insert_index_ is laid out on the right,
   // with the greatest index (the first one added to the right) being laid out