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 293 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();
+  // 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();
 
   // 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 55 matching lines @@
 #if !defined(USE_AURA)
   // Returns |location_entry_| cast to OmniboxViewWin, or NULL if
   // |location_entry_| is of a different type.
   OmniboxViewWin* GetOmniboxViewWin();
 #endif
 #endif
 
   // 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_;
 
   // The profile which corresponds to this View.
   Profile* profile_;
 
   // Command updater which corresponds to this View.
   CommandUpdater* command_updater_;
 
   // The model.
@@ skipping 74 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_