summaryrefslogtreecommitdiffstats
path: root/chrome/browser/defaults.cc
diff options
context:
space:
mode:
authorbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-08-11 19:45:19 +0000
committerbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-08-11 19:45:19 +0000
commit34cc1917d8003c107c1c320e5b50fe240de8a010 (patch)
tree4731a3d0036c85308171ec612a4bcd6cd15e1e60 /chrome/browser/defaults.cc
parent960141c714a764b26ab954773018e68eafc3b97d (diff)
downloadchromium_src-34cc1917d8003c107c1c320e5b50fe240de8a010.zip
chromium_src-34cc1917d8003c107c1c320e5b50fe240de8a010.tar.gz
chromium_src-34cc1917d8003c107c1c320e5b50fe240de8a010.tar.bz2
Add a first attempt at a compact location bar and a status bar. The status bar
contains a clock, an application menu, and a non-working battery indicator. The compact location bar can be toggled by COMPACT_NAV_BAR in browser_window_gtk.cc Review URL: http://codereview.chromium.org/165272 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@23070 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/defaults.cc')
-rw-r--r--chrome/browser/defaults.cc13
1 files changed, 11 insertions, 2 deletions
diff --git a/chrome/browser/defaults.cc b/chrome/browser/defaults.cc
index 73f6996..2be990d 100644
--- a/chrome/browser/defaults.cc
+++ b/chrome/browser/defaults.cc
@@ -8,7 +8,9 @@ namespace browser_defaults {
#if defined(OS_CHROMEOS)
-const bool kForceAutocompleteEditFontSize = false;
+const double kAutocompleteEditFontPixelSize = 12.0;
+const double kAutocompleteEditFontPixelSizeInPopup = kAutocompletePopupFontSize;
+
const int kAutocompletePopupFontSize = 7;
const SessionStartupPref::Type kDefaultSessionStartupType =
SessionStartupPref::LAST;
@@ -17,7 +19,14 @@ const bool kRestoreAfterCrash = true;
#elif defined(OS_LINUX)
-const bool kForceAutocompleteEditFontSize = true;
+// 13.4px = 10pt @ 96dpi.
+const double kAutocompleteEditFontPixelSize = 13.4;
+
+// On Windows, popup windows' autocomplete box have a font 5/6 the size of a
+// regular window, which we duplicate here for GTK.
+const double kAutocompleteEditFontPixelSizeInPopup =
+ kAutocompleteEditFontPixelSize * 5.0 / 6.0;
+
const int kAutocompletePopupFontSize = 10;
#endif