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

chrome/browser/defaults.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/defaults.h"
 
 namespace browser_defaults {
 
 #if defined(USE_X11)
 #if defined(TOOLKIT_VIEWS)
 const bool kCanToggleSystemTitleBar = false;
 #else
 const bool kCanToggleSystemTitleBar = true;
 #endif
+#endif
 
-#if defined(OS_CHROMEOS)
+#if defined(TOOLKIT_GTK)
+// 14px = 10.5pt @ 96dpi.
+const int kOmniboxFontPixelSize = 14;
+#else
 // Make the regular omnibox text two points larger than the nine-point font
 // used in the tab strip (11pt / 72pt/in * 96px/in = 14.667px).
-const int kAutocompleteEditFontPixelSize = 15;
-const int kAutocompleteEditFontPixelSizeInPopup = 10;
-#elif defined(TOOLKIT_GTK)
-// 14px = 10.5pt @ 96dpi.
-const int kAutocompleteEditFontPixelSize = 14;
-// On Windows, popup windows' location text uses a font 5/6 the size of
-// that in a regular window, which we duplicate here for GTK.
-const int kAutocompleteEditFontPixelSizeInPopup =
-    kAutocompleteEditFontPixelSize * 5.0 / 6.0;
-#endif
+const int kOmniboxFontPixelSize = 15;
 #endif
 
 #if defined(TOOLKIT_VIEWS)
 // Windows and Chrome OS have bigger shadows in the tab art.
 const int kMiniTabWidth = 64;
 #else
 const int kMiniTabWidth = 56;
 #endif
 
 const bool kRestorePopups = false;
@@ skipping 56 matching lines @@
 const bool kPasswordEchoEnabled = true;
 #else
 const bool kPasswordEchoEnabled = false;
 #endif
 
 bool bookmarks_enabled = true;
 
 bool enable_help_app = true;
 
 }  // namespace browser_defaults