Cleanup: Rename GetHeight to more appropriate GetPreferredInternalHeight.

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

 // Copyright (c) 2012 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.
 
 #ifndef CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_LOCATION_BAR_VIEW_H_
 #define CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_LOCATION_BAR_VIEW_H_
 #pragma once
 
 #include <string>
 #include <vector>
@@ skipping 294 matching lines @@
   virtual void TestPageActionPressed(size_t index) OVERRIDE;
 
   // Overridden from TemplateURLServiceObserver
   virtual void OnTemplateURLServiceChanged() OVERRIDE;
 
   // Overridden from content::NotificationObserver
   virtual void Observe(int type,
                        const content::NotificationSource& source,
                        const content::NotificationDetails& details) OVERRIDE;
 
-  // Calculates the height of the view.
-  int GetHeight();
+  // 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);
 
   // Space between items in the location bar.
   static int GetItemPadding();
 
   // Space between the edges and the items next to them.
   static int GetEdgeItemPadding();
 
   // Thickness of the left and right edges of the omnibox, in normal mode.
   static const int kNormalHorizontalEdgeThickness;
   // Thickness of the top and bottom edges of the omnibox.
@@ skipping 152 matching lines @@
   // While animating, the host clips the widget and draws only the bottom
   // part of it. The view needs to know the pixel offset at which we are drawing
   // the widget so that we can draw the curved edges that attach to the toolbar
   // in the right location.
   int animation_offset_;
 
   DISALLOW_IMPLICIT_CONSTRUCTORS(LocationBarView);
 };
 
 #endif  // CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_LOCATION_BAR_VIEW_H_