Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(950)

Unified Diff: chrome/browser/defaults.cc

Issue 15962013: Switch to using the same font in popup window address bars as for normal windows. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 7 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/defaults.h ('k') | chrome/browser/ui/gtk/location_bar_view_gtk.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/defaults.cc
===================================================================
--- chrome/browser/defaults.cc (revision 202159)
+++ chrome/browser/defaults.cc (working copy)
@@ -12,21 +12,16 @@
#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;
+const int kOmniboxFontPixelSize = 15;
#endif
-#endif
#if defined(TOOLKIT_VIEWS)
// Windows and Chrome OS have bigger shadows in the tab art.
« no previous file with comments | « chrome/browser/defaults.h ('k') | chrome/browser/ui/gtk/location_bar_view_gtk.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698