Switch to using the same font in popup window address bars as for normal windows.

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 228 matching lines @@
   DCHECK(GetWidget());
 
   location_icon_view_ = new LocationIconView(this);
   location_icon_view_->set_drag_controller(this);
   AddChildView(location_icon_view_);
 
   // Determine the main font.
   gfx::Font font(ui::ResourceBundle::GetSharedInstance().GetFont(
       ui::ResourceBundle::BaseFont));
   const int current_font_size = font.GetFontSize();
-  const int kAutocompleteEditFontPixelSize = 15;
-  const int kAutocompleteEditFontPixelSizeInPopup = 12;
-  const int desired_font_size = is_popup_mode_ ?
-      kAutocompleteEditFontPixelSizeInPopup : kAutocompleteEditFontPixelSize;
+  const int desired_font_size = browser_defaults::kOmniboxFontPixelSize;
   if (current_font_size < desired_font_size)
     font = font.DeriveFont(desired_font_size - current_font_size);
   // Shrink large fonts to make them fit.
   // TODO(pkasting): Stretch the location bar instead in this case.
   int location_height = GetInternalHeight(true);
   int font_y_offset;
   CalculateFontAndOffsetForHeight(location_height, &font, &font_y_offset);
 
   // Determine the font for use inside the bubbles.
   gfx::Font bubble_font(font);
@@ skipping 1280 matching lines @@
 int LocationBarView::GetInternalHeight(bool use_preferred_size) {
   int total_height =
       use_preferred_size ? GetPreferredSize().height() : height();
   return std::max(total_height - (vertical_edge_thickness() * 2), 0);
 }
 
 bool LocationBarView::HasValidSuggestText() const {
   return suggested_text_view_->visible() &&
       !suggested_text_view_->size().IsEmpty();
 }