diff options
| author | idana@chromium.org <idana@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-20 20:05:07 +0000 |
|---|---|---|
| committer | idana@chromium.org <idana@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-20 20:05:07 +0000 |
| commit | 7ec7b442ebfb19101cde295a35342c56530558cd (patch) | |
| tree | 66ed73addbf2bc261152747f30e0e0063f3aab4e /chrome/browser/views/options/content_page_view.cc | |
| parent | 08ccead5e716d672110f94d3f336708c1f15fbe1 (diff) | |
| download | chromium_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/views/options/content_page_view.cc')
| -rw-r--r-- | chrome/browser/views/options/content_page_view.cc | 15 |
1 files changed, 8 insertions, 7 deletions
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()); |