summaryrefslogtreecommitdiffstats
path: root/chrome/browser/chromeos/clock_menu_button.cc
diff options
context:
space:
mode:
authorchocobo@google.com <chocobo@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-14 00:08:33 +0000
committerchocobo@google.com <chocobo@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-14 00:08:33 +0000
commit0108cbee8d7ea94e97eac5092302b469a61a25d0 (patch)
treeba980be2720d7c7b19a214013c679b1097f9382e /chrome/browser/chromeos/clock_menu_button.cc
parent3e193f9c0f91dc891cc38774b2e1b800ebfde46e (diff)
downloadchromium_src-0108cbee8d7ea94e97eac5092302b469a61a25d0.zip
chromium_src-0108cbee8d7ea94e97eac5092302b469a61a25d0.tar.gz
chromium_src-0108cbee8d7ea94e97eac5092302b469a61a25d0.tar.bz2
Make cros library thread-safe.
Adds unmonitoring of network status changes. Fixed a few edge case bugs. BUG=23923 TEST=none Review URL: http://codereview.chromium.org/272019 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@28918 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/chromeos/clock_menu_button.cc')
-rw-r--r--chrome/browser/chromeos/clock_menu_button.cc5
1 files changed, 5 insertions, 0 deletions
diff --git a/chrome/browser/chromeos/clock_menu_button.cc b/chrome/browser/chromeos/clock_menu_button.cc
index a628cc8..99da88a 100644
--- a/chrome/browser/chromeos/clock_menu_button.cc
+++ b/chrome/browser/chromeos/clock_menu_button.cc
@@ -24,6 +24,11 @@ ClockMenuButton::ClockMenuButton()
ResourceBundle::BaseFont).DeriveFont(0, gfx::Font::BOLD));
SetEnabledColor(SK_ColorWHITE);
SetShowHighlighted(false);
+ // Set initial text to make sure that the text button wide enough.
+ std::wstring zero = ASCIIToWide("00");
+ SetText(l10n_util::GetStringF(IDS_STATUSBAR_CLOCK_SHORT_TIME_AM, zero, zero));
+ SetText(l10n_util::GetStringF(IDS_STATUSBAR_CLOCK_SHORT_TIME_PM, zero, zero));
+ set_alignment(TextButton::ALIGN_RIGHT);
UpdateText();
}