diff options
| author | sail@chromium.org <sail@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-18 02:12:40 +0000 |
|---|---|---|
| committer | sail@chromium.org <sail@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-18 02:12:40 +0000 |
| commit | 3a54c8d27749347d4e92b3edacd335eedf7765cd (patch) | |
| tree | 6dfcdf55a565afd432ae5226965e2d72cee7d2b7 /chrome/browser/chromeos/status/clock_menu_button.cc | |
| parent | d1282c219c49e2a8baa4326ac1b847f9c24e0c6d (diff) | |
| download | chromium_src-3a54c8d27749347d4e92b3edacd335eedf7765cd.zip chromium_src-3a54c8d27749347d4e92b3edacd335eedf7765cd.tar.gz chromium_src-3a54c8d27749347d4e92b3edacd335eedf7765cd.tar.bz2 | |
Revert 105998 - views: Change TextButtonBase API to string16.
BUG=68267
R=sky@chromium.org
Review URL: http://codereview.chromium.org/8262003
TBR=tfarina@chromium.org
Review URL: http://codereview.chromium.org/8329010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@106001 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/chromeos/status/clock_menu_button.cc')
| -rw-r--r-- | chrome/browser/chromeos/status/clock_menu_button.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/chromeos/status/clock_menu_button.cc b/chrome/browser/chromeos/status/clock_menu_button.cc index 6921a1a..ef660f0 100644 --- a/chrome/browser/chromeos/status/clock_menu_button.cc +++ b/chrome/browser/chromeos/status/clock_menu_button.cc @@ -91,10 +91,10 @@ void ClockMenuButton::UpdateText() { const bool use_24hour_clock = host_->GetProfile() ? host_->GetProfile()->GetPrefs()->GetBoolean(prefs::kUse24HourClock) : default_use_24hour_clock_; - SetText(base::TimeFormatTimeOfDayWithHourClockType( + SetText(UTF16ToWide(base::TimeFormatTimeOfDayWithHourClockType( time, use_24hour_clock ? base::k24HourClock : base::k12HourClock, - base::kDropAmPm)); + base::kDropAmPm))); SetTooltipText(base::TimeFormatFriendlyDateAndTime(time)); SetAccessibleName(base::TimeFormatFriendlyDateAndTime(time)); SchedulePaint(); |