Cleanup: Rename GetHeight to more appropriate GetPreferredInternalHeight.

chrome/browser/ui/views/location_bar/location_bar_view.h

Index: chrome/browser/ui/views/location_bar/location_bar_view.h
diff --git a/chrome/browser/ui/views/location_bar/location_bar_view.h b/chrome/browser/ui/views/location_bar/location_bar_view.h
index 26cdfc8180d9693999536b3c17d80b1317e11d90..66af68507d047db7a952b624bd282ef296d91f2d 100644
--- a/chrome/browser/ui/views/location_bar/location_bar_view.h
+++ b/chrome/browser/ui/views/location_bar/location_bar_view.h
@@ -311,8 +311,9 @@ class LocationBarView : public LocationBar,
                        const content::NotificationSource& source,
                        const content::NotificationDetails& details) OVERRIDE;
 
-  // Calculates the height of the view.
-  int GetHeight();
+  // Calculates the preferred internal height of the view, i.e. the
+  // height occupied by the edit control within it.
+  int GetPreferredInternalHeight();

[Peter Kasting, 2012/05/18 22:45:40]

Nit: I still think this is preferable:

  // Returns the height of the control without the top and bottom edges (i.e.
  // the height of the edit control inside).  If |use_preferred_size| is true
  // this will be the preferred height, otherwise it will be the current height.
  int GetInternalHeight(bool use_preferred_size);

This is not only simpler but seems clearer to me.

 
   // Space between items in the location bar.
   static int GetItemPadding();
@@ -388,6 +389,9 @@ class LocationBarView : public LocationBar,
   // Helper to show the first run info bubble.
   void ShowFirstRunBubbleInternal();
 
+  // Returns the internal height of the view after insets.
+  int GetInternalHeightImpl(int full_height);
+
   // The Autocomplete Edit field.
   scoped_ptr<OmniboxView> location_entry_;