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

4 files changed, 19 insertions, 20 deletions

diff --git a/chrome/browser/views/bookmark_bar_view.cc b/chrome/browser/views/bookmark_bar_view.cc
index 56386fc..6c957f7 100644
--- a/chrome/browser/views/bookmark_bar_view.cc
+++ b/chrome/browser/views/bookmark_bar_view.cc
@@ -19,7 +19,6 @@
 #include "chrome/browser/profile.h"
 #include "chrome/browser/renderer_host/render_view_host.h"
 #include "chrome/browser/renderer_host/render_widget_host_view.h"
-#include "chrome/browser/sync/personalization_strings.h"
 #include "chrome/browser/sync/sync_status_ui_helper.h"
 #include "chrome/browser/tab_contents/page_navigator.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
@@ -1889,16 +1888,16 @@ bool BookmarkBarView::ShouldShowSyncErrorButton() {
 
 views::TextButton* BookmarkBarView::CreateSyncErrorButton() {
   views::TextButton* sync_error_button =
-      new views::TextButton(this, kBookmarkBarSyncErrorButtonText);
+      new views::TextButton(this,
+              l10n_util::GetString(IDS_SYNC_BOOKMARK_BAR_ERROR));
   sync_error_button->set_tag(kSyncErrorButtonTag);
 
   // The tooltip is the only way we have to display text explaining the error
   // to the user.
-  sync_error_button->SetTooltipText(kBookmarkBarErrorTooltip);
-
-  // TODO(idana): set an appropriate accessible name when the personalization
-  // strings are moved to the .GRD file.
-  sync_error_button->SetAccessibleName(kBookmarkBarErrorTooltip);
+  sync_error_button->SetTooltipText(
+      l10n_util::GetString(IDS_SYNC_BOOKMARK_BAR_ERROR_DESC));
+  sync_error_button->SetAccessibleName(
+      l10n_util::GetString(IDS_ACCNAME_SYNC_ERROR_BUTTON));
   sync_error_button->SetIcon(
       *ResourceBundle::GetSharedInstance().GetBitmapNamed(IDR_WARNING));
   return sync_error_button;
diff --git a/chrome/browser/views/options/content_page_view.cc b/chrome/browser/views/options/content_page_view.cc
index 4a1c932..81bfeef 100644
--- a/chrome/browser/views/options/content_page_view.cc
+++ b/chrome/browser/views/options/content_page_view.cc
@@ -16,7 +16,6 @@
 #include "chrome/browser/browser.h"
 #include "chrome/browser/browser_list.h"
 #include "chrome/browser/browser_process.h"
-#include "chrome/browser/sync/personalization_strings.h"
 #include "chrome/browser/sync/sync_status_ui_helper.h"
 #include "chrome/browser/views/clear_browsing_data.h"
 #include "chrome/browser/views/importer_view.h"
@@ -445,9 +444,7 @@ void ContentPageView::InitSyncGroup() {
   layout->AddView(sync_start_stop_button_);
 
   sync_group_ = new OptionsGroupView(contents,
-                                     kSyncGroupName,
-                                     std::wstring(),
-                                     true);
+      l10n_util::GetString(IDS_SYNC_OPTIONS_GROUP_NAME), std::wstring(), true);
 }
 
 void ContentPageView::UpdateSyncControls() {
@@ -458,9 +455,13 @@ void ContentPageView::UpdateSyncControls() {
   bool sync_setup_completed = sync_service_->HasSyncSetupCompleted();
   bool status_has_error = SyncStatusUIHelper::GetLabels(sync_service_,
       &status_label, &link_label) == SyncStatusUIHelper::SYNC_ERROR;
-  button_label = sync_setup_completed ? kStopSyncButtonLabel :
-                 sync_service_->SetupInProgress() ? UTF8ToWide(kSettingUpText)
-                 : kStartSyncButtonLabel;
+  if (sync_setup_completed) {
+    button_label = l10n_util::GetString(IDS_SYNC_STOP_SYNCING_BUTTON_LABEL);
+  } else if (sync_service_->SetupInProgress()) {
+    button_label = l10n_util::GetString(IDS_SYNC_NTP_SETUP_IN_PROGRESS);
+  } else {
+    button_label = l10n_util::GetString(IDS_SYNC_START_SYNC_BUTTON_LABEL);
+  }
 
   sync_status_label_->SetText(status_label);
   sync_start_stop_button_->SetEnabled(!sync_service_->WizardIsVisible());
diff --git a/chrome/browser/views/sync/sync_setup_flow.h b/chrome/browser/views/sync/sync_setup_flow.h
index 1e22cf0..52bf32f 100644
--- a/chrome/browser/views/sync/sync_setup_flow.h
+++ b/chrome/browser/views/sync/sync_setup_flow.h
@@ -10,10 +10,11 @@
 #include <string>
 #include <vector>
 
+#include "app/l10n_util.h"
 #include "base/time.h"
 #include "chrome/browser/dom_ui/html_dialog_ui.h"
-#include "chrome/browser/sync/personalization_strings.h"
 #include "chrome/browser/views/sync/sync_setup_wizard.h"
+#include "grit/generated_resources.h"
 
 class FlowHandler;
 class SyncSetupFlowContainer;
@@ -67,7 +68,7 @@ class SyncSetupFlow : public HtmlDialogUIDelegate {
 
   // HtmlDialogUIDelegate implementation.
   virtual std::wstring GetDialogTitle() const {
-    return kLoginDialogTitle;
+    return l10n_util::GetString(IDS_SYNC_LOGIN_DIALOG_TITLE);
   }
 
   // HtmlDialogUIDelegate implementation.
diff --git a/chrome/browser/views/toolbar_view.cc b/chrome/browser/views/toolbar_view.cc
index f7c3518..577ccfe 100644
--- a/chrome/browser/views/toolbar_view.cc
+++ b/chrome/browser/views/toolbar_view.cc
@@ -39,9 +39,6 @@
 #include "chrome/common/notification_service.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/pref_service.h"
-#ifdef CHROME_PERSONALIZATION
-#include "chrome/browser/sync/personalization_strings.h"
-#endif
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
@@ -1086,7 +1083,8 @@ void ToolbarView::CreateAppMenu() {
   app_menu_contents_->AddSeparator();
 #ifdef CHROME_PERSONALIZATION
   if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kEnableSync)) {
-    app_menu_contents_->AddItem(IDC_SYNC_BOOKMARKS, kMenuLabelStartSync);
+    app_menu_contents_->AddItem(IDC_SYNC_BOOKMARKS,
+                                l10n_util::GetString(IDS_SYNC_MENU_LABEL));
   }
 #endif
   app_menu_contents_->AddItemWithStringId(IDC_CLEAR_BROWSING_DATA,