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

1 files changed, 22 insertions, 17 deletions

diff --git a/chrome/browser/sync/sync_status_ui_helper.cc b/chrome/browser/sync/sync_status_ui_helper.cc
index d16068f..0e7f721 100644
--- a/chrome/browser/sync/sync_status_ui_helper.cc
+++ b/chrome/browser/sync/sync_status_ui_helper.cc
@@ -6,10 +6,12 @@
 
 #include "chrome/browser/sync/sync_status_ui_helper.h"
 
+#include "app/l10n_util.h"
 #include "base/string_util.h"
 #include "chrome/browser/sync/auth_error_state.h"
-#include "chrome/browser/sync/personalization_strings.h"
 #include "chrome/browser/sync/profile_sync_service.h"
+#include "grit/chromium_strings.h"
+#include "grit/generated_resources.h"
 
 // Given an authentication state, this helper function returns the appropriate
 // status message and, if necessary, the text that should appear in the
@@ -18,23 +20,27 @@ static void GetLabelsForAuthError(AuthErrorState auth_error,
     ProfileSyncService* service, std::wstring* status_label,
     std::wstring* link_label) {
   if (link_label)
-    link_label->assign(kSyncReLoginLinkLabel);
+    link_label->assign(l10n_util::GetString(IDS_SYNC_RELOGIN_LINK_LABEL));
   if (auth_error == AUTH_ERROR_INVALID_GAIA_CREDENTIALS) {
     // If the user name is empty then the first login failed, otherwise the
     // credentials are out-of-date.
     if (service->GetAuthenticatedUsername().empty())
-      status_label->append(kSyncInvalidCredentialsError);
+      status_label->assign(
+          l10n_util::GetString(IDS_SYNC_INVALID_USER_CREDENTIALS));
     else
-      status_label->append(kSyncExpiredCredentialsError);
+      status_label->assign(
+          l10n_util::GetString(IDS_SYNC_LOGIN_INFO_OUT_OF_DATE));
   } else if (auth_error == AUTH_ERROR_CONNECTION_FAILED) {
     // Note that there is little the user can do if the server is not
     // reachable. Since attempting to re-connect is done automatically by
     // the Syncer, we do not show the (re)login link.
-    status_label->append(kSyncServerUnavailableMsg);
+    status_label->assign(
+        l10n_util::GetStringF(IDS_SYNC_SERVER_IS_UNREACHABLE,
+                              l10n_util::GetString(IDS_PRODUCT_NAME)));
     if (link_label)
       link_label->clear();
   } else {
-    status_label->append(kSyncOtherLoginErrorLabel);
+    status_label->assign(l10n_util::GetString(IDS_SYNC_ERROR_SIGNING_IN));
   }
 }
 
@@ -47,12 +53,8 @@ static std::wstring GetSyncedStateStatusLabel(ProfileSyncService* service) {
   if (user_name.empty())
     return label;
 
-  label += kSyncAccountLabel;
-  label += user_name;
-  label += L"\n";
-  label += kLastSyncedLabel;
-  label += service->GetLastSyncedTimeString();
-  return label;
+  return l10n_util::GetStringF(IDS_SYNC_ACCOUNT_SYNCED_TO_USER_WITH_TIME,
+                               user_name, service->GetLastSyncedTimeString());
 }
 
 // static
@@ -72,7 +74,7 @@ SyncStatusUIHelper::MessageType SyncStatusUIHelper::GetLabels(
       status_label->assign(GetSyncedStateStatusLabel(service));
       DCHECK_EQ(auth_error, AUTH_ERROR_NONE);
     } else if (service->UIShouldDepictAuthInProgress()) {
-      status_label->assign(kSyncAuthenticatingLabel);
+      status_label->assign(l10n_util::GetString(IDS_SYNC_AUTHENTICATING_LABEL));
       result_type = PRE_SYNCED;
     } else if (auth_error != AUTH_ERROR_NONE) {
       GetLabelsForAuthError(auth_error, service, status_label, link_label);
@@ -85,18 +87,21 @@ SyncStatusUIHelper::MessageType SyncStatusUIHelper::GetLabels(
     if (service->SetupInProgress()) {
       ProfileSyncService::Status status(service->QueryDetailedSyncStatus());
       AuthErrorState auth_error(service->GetAuthErrorState());
-      status_label->assign(UTF8ToWide(kSettingUpText));
+      status_label->assign(
+          l10n_util::GetString(IDS_SYNC_NTP_SETUP_IN_PROGRESS));
       if (service->UIShouldDepictAuthInProgress()) {
-        status_label->assign(kSyncAuthenticatingLabel);
+        status_label->assign(
+            l10n_util::GetString(IDS_SYNC_AUTHENTICATING_LABEL));
       } else if (auth_error != AUTH_ERROR_NONE) {
         status_label->clear();
         GetLabelsForAuthError(auth_error, service, status_label, NULL);
         result_type = SYNC_ERROR;
       } else if (!status.authenticated) {
-        status_label->assign(kSyncCredentialsNeededLabel);
+        status_label->assign(
+            l10n_util::GetString(IDS_SYNC_ACCOUNT_DETAILS_NOT_ENTERED));
       }
     } else {
-      status_label->assign(kSyncNotSetupInfo);
+      status_label->assign(l10n_util::GetString(IDS_SYNC_NOT_SET_UP_INFO));
     }
   }
   return result_type;