diff options
| author | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-22 15:22:07 +0000 |
|---|---|---|
| committer | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-22 15:22:07 +0000 |
| commit | e25f12b920ead3a56f0bc916c1ebdc40eb3ac73c (patch) | |
| tree | e57519717c2afd08a89c215a6aa781ee081d4537 /chrome/browser | |
| parent | 1b6dc3e04f3438ab25faff315890bc82e82a262a (diff) | |
| download | chromium_src-e25f12b920ead3a56f0bc916c1ebdc40eb3ac73c.zip chromium_src-e25f12b920ead3a56f0bc916c1ebdc40eb3ac73c.tar.gz chromium_src-e25f12b920ead3a56f0bc916c1ebdc40eb3ac73c.tar.bz2 | |
Update CrOS time formatting APIs too.
BUG=23581
TEST=everything still works
Review URL: http://codereview.chromium.org/6037009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@69949 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser')
| -rw-r--r-- | chrome/browser/chromeos/cros/network_library.cc | 8 | ||||
| -rw-r--r-- | chrome/browser/chromeos/status/clock_menu_button.cc | 6 |
2 files changed, 6 insertions, 8 deletions
diff --git a/chrome/browser/chromeos/cros/network_library.cc b/chrome/browser/chromeos/cros/network_library.cc index 255a302..b99cb95 100644 --- a/chrome/browser/chromeos/cros/network_library.cc +++ b/chrome/browser/chromeos/cros/network_library.cc @@ -387,7 +387,7 @@ string16 CellularDataPlan::GetPlanDesciption() const { case chromeos::CELLULAR_DATA_PLAN_UNLIMITED: { return l10n_util::GetStringFUTF16( IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_PURCHASE_UNLIMITED_DATA, - WideToUTF16(base::TimeFormatFriendlyDate(plan_start_time))); + base::TimeFormatFriendlyDate(plan_start_time)); break; } case chromeos::CELLULAR_DATA_PLAN_METERED_PAID: { @@ -396,8 +396,7 @@ string16 CellularDataPlan::GetPlanDesciption() const { FormatBytes(plan_data_bytes, GetByteDisplayUnits(plan_data_bytes), true), - WideToUTF16(base::TimeFormatFriendlyDate( - plan_start_time))); + base::TimeFormatFriendlyDate(plan_start_time)); } case chromeos::CELLULAR_DATA_PLAN_METERED_BASE: { return l10n_util::GetStringFUTF16( @@ -405,8 +404,7 @@ string16 CellularDataPlan::GetPlanDesciption() const { FormatBytes(plan_data_bytes, GetByteDisplayUnits(plan_data_bytes), true), - WideToUTF16(base::TimeFormatFriendlyDate( - plan_start_time))); + base::TimeFormatFriendlyDate(plan_start_time)); default: break; } diff --git a/chrome/browser/chromeos/status/clock_menu_button.cc b/chrome/browser/chromeos/status/clock_menu_button.cc index 3551083..b239112 100644 --- a/chrome/browser/chromeos/status/clock_menu_button.cc +++ b/chrome/browser/chromeos/status/clock_menu_button.cc @@ -76,8 +76,8 @@ void ClockMenuButton::UpdateTextAndSetNextTimer() { void ClockMenuButton::UpdateText() { base::Time time(base::Time::Now()); - SetText(base::TimeFormatTimeOfDay(time)); - SetTooltipText(base::TimeFormatShortDate(time)); + SetText(UTF16ToWide(base::TimeFormatTimeOfDay(time))); + SetTooltipText(UTF16ToWide(base::TimeFormatShortDate(time))); SchedulePaint(); } @@ -99,7 +99,7 @@ menus::MenuModel::ItemType ClockMenuButton::GetTypeAt(int index) const { string16 ClockMenuButton::GetLabelAt(int index) const { if (index == 0) - return WideToUTF16(base::TimeFormatFriendlyDate(base::Time::Now())); + return base::TimeFormatFriendlyDate(base::Time::Now()); return l10n_util::GetStringUTF16(IDS_STATUSBAR_CLOCK_OPEN_OPTIONS_DIALOG); } |