Cleanup: Rename GetHeight to more appropriate GetPreferredInternalHeight.

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

 // 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.
 
 #include "chrome/browser/ui/views/location_bar/location_bar_view.h"
 
 #include <algorithm>
 #include <map>
 
 #include "base/command_line.h"
@@ skipping 164 matching lines @@
 void LocationBarView::Init() {
   ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
   if (mode_ == POPUP) {
     font_ = rb.GetFont(ui::ResourceBundle::BaseFont);
   } else {
     // Use a larger version of the system font.
     font_ = rb.GetFont(ui::ResourceBundle::MediumFont);
   }
 
   // If this makes the font too big, try to make it smaller so it will fit.
-  const int height = GetHeight();
+  const int height = GetInternalHeight(true);
   while ((font_.GetHeight() > height) && (font_.GetFontSize() > 1))
     font_ = font_.DeriveFont(-1);
 
   location_icon_view_ = new LocationIconView(this);
   AddChildView(location_icon_view_);
   location_icon_view_->SetVisible(true);
   location_icon_view_->set_drag_controller(this);
 
   ev_bubble_view_ =
       new EVBubbleView(kEVBubbleBackgroundImages, IDR_OMNIBOX_HTTPS_VALID,
@@ skipping 323 matching lines @@
 
   // TODO(jhawkins): Remove once crbug.com/101994 is fixed.
   CHECK(location_icon_view_);
 
   // TODO(sky): baseline layout.
   int location_y = kVerticalEdgeThickness;
   // In some cases (e.g. fullscreen mode) we may have 0 height.  We still want
   // to position our child views in this case, because other things may be
   // positioned relative to them (e.g. the "bookmark added" bubble if the user
   // hits ctrl-d).
-  int location_height = std::max(height() - (kVerticalEdgeThickness * 2), 0);
+  int location_height = GetInternalHeight(false);
 
   // The edge stroke is 1 px thick.  In popup mode, the edges are drawn by the
   // omnibox' parent, so there isn't any edge to account for at all.
   const int kEdgeThickness = (mode_ == NORMAL) ?
       kNormalHorizontalEdgeThickness : 0;
   // The edit has 1 px of horizontal whitespace inside it before the text.
   const int kEditInternalSpace = 1;
   // The space between an item and the edit is the normal item space, minus the
   // edit's built-in space (so the apparent space will be the same).
   const int kItemEditPadding = GetItemPadding() - kEditInternalSpace;
@@ skipping 746 matching lines @@
 void LocationBarView::Observe(int type,
                               const content::NotificationSource& source,
                               const content::NotificationDetails& details) {
   if (type == chrome::NOTIFICATION_PREF_CHANGED) {
     std::string* name = content::Details<std::string>(details).ptr();
     if (*name == prefs::kEditBookmarksEnabled)
       Update(NULL);
   }
 }
 
-int LocationBarView::GetHeight() {
-  return std::max(
-      GetPreferredSize().height() - (kVerticalEdgeThickness * 2), 0);
+int LocationBarView::GetInternalHeight(bool use_preferred_size) {
+  int total_height =
+      use_preferred_size ? GetPreferredSize().height() : height();
+  return std::max(total_height - (kVerticalEdgeThickness * 2), 0);
 }
 
 #if defined(OS_WIN) || defined(USE_AURA)
 bool LocationBarView::HasValidSuggestText() const {
   return suggested_text_view_ && !suggested_text_view_->size().IsEmpty() &&
       !suggested_text_view_->text().empty();
 }
 
 #if !defined(USE_AURA)
 OmniboxViewWin* LocationBarView::GetOmniboxViewWin() {
   return static_cast<OmniboxViewWin*>(location_entry_.get());
 }
 #endif
 #endif