summaryrefslogtreecommitdiffstats
path: root/chrome/browser/sync/profile_sync_service.cc
diff options
context:
space:
mode:
authoridana@chromium.org <idana@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-08-20 20:05:07 +0000
committeridana@chromium.org <idana@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-08-20 20:05:07 +0000
commit7ec7b442ebfb19101cde295a35342c56530558cd (patch)
tree66ed73addbf2bc261152747f30e0e0063f3aab4e /chrome/browser/sync/profile_sync_service.cc
parent08ccead5e716d672110f94d3f336708c1f15fbe1 (diff)
downloadchromium_src-7ec7b442ebfb19101cde295a35342c56530558cd.zip
chromium_src-7ec7b442ebfb19101cde295a35342c56530558cd.tar.gz
chromium_src-7ec7b442ebfb19101cde295a35342c56530558cd.tar.bz2
Removed personalization_strings.h and moved all the strings into generated_resources.grd.
I'll take care of the Setup Wizard strings/resources in my next patch. BUG=none TEST=none Review URL: http://codereview.chromium.org/173069 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@23863 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/sync/profile_sync_service.cc')
-rw-r--r--chrome/browser/sync/profile_sync_service.cc7
1 files changed, 4 insertions, 3 deletions
diff --git a/chrome/browser/sync/profile_sync_service.cc b/chrome/browser/sync/profile_sync_service.cc
index 0690273..9eb2acc 100644
--- a/chrome/browser/sync/profile_sync_service.cc
+++ b/chrome/browser/sync/profile_sync_service.cc
@@ -8,6 +8,7 @@
#include <stack>
#include <vector>
+#include "app/l10n_util.h"
#include "base/basictypes.h"
#include "base/command_line.h"
#include "base/file_path.h"
@@ -22,13 +23,13 @@
#include "chrome/browser/history/history_types.h"
#include "chrome/browser/profile.h"
#include "chrome/browser/sync/engine/syncapi.h"
-#include "chrome/browser/sync/personalization_strings.h"
#include "chrome/common/chrome_switches.h"
#include "chrome/common/notification_service.h"
#include "chrome/common/notification_type.h"
#include "chrome/common/pref_names.h"
#include "chrome/common/pref_service.h"
#include "chrome/common/time_format.h"
+#include "grit/generated_resources.h"
#include "views/window/window.h"
using browser_sync::ChangeProcessor;
@@ -308,12 +309,12 @@ std::wstring ProfileSyncService::BuildSyncStatusSummaryText(
std::wstring ProfileSyncService::GetLastSyncedTimeString() const {
if (last_synced_time_.is_null())
- return kLastSyncedTimeNever;
+ return l10n_util::GetString(IDS_SYNC_TIME_NEVER);
base::TimeDelta last_synced = base::Time::Now() - last_synced_time_;
if (last_synced < base::TimeDelta::FromMinutes(1))
- return kLastSyncedTimeWithinLastMinute;
+ return l10n_util::GetString(IDS_SYNC_TIME_JUST_NOW);
return TimeFormat::TimeElapsed(last_synced);
}