Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3851)

Unified Diff: chrome/browser/ui/webui/options/personal_options_handler.cc

Issue 6961014: Modify settings page text when syncing. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix string description and don't use local var for error. Created 9 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/webui/options/personal_options_handler.cc
diff --git a/chrome/browser/ui/webui/options/personal_options_handler.cc b/chrome/browser/ui/webui/options/personal_options_handler.cc
index df33fa3740743f4ffc32ef233ccbd503d1ebe656..1cd3e33d8129ebfe83b55e282413d8b8a645748e 100644
--- a/chrome/browser/ui/webui/options/personal_options_handler.cc
+++ b/chrome/browser/ui/webui/options/personal_options_handler.cc
@@ -236,8 +236,21 @@ void PersonalOptionsHandler::OnStateChanged() {
DCHECK(service);
bool managed = service->IsManaged();
bool sync_setup_completed = service->HasSyncSetupCompleted();
- bool status_has_error = sync_ui_util::GetStatusLabels(service,
- &status_label, &link_label) == sync_ui_util::SYNC_ERROR;
+ bool status_has_error = sync_ui_util::GetStatusLabels(
+ service, &status_label, &link_label) == sync_ui_util::SYNC_ERROR;
+ browser_sync::SyncBackendHost::StatusSummary summary =
+ service->QuerySyncStatusSummary();
+
+ if (!status_has_error &&
+ summary == browser_sync::SyncBackendHost::Status::SYNCING) {
+ string16 user_name(service->GetAuthenticatedUsername());
+ status_label.assign(l10n_util::GetStringFUTF16(
+ CommandLine::ForCurrentProcess()->HasSwitch(switches::kMultiProfiles) ?
+ IDS_PROFILES_SYNCING_TO_USER :
+ IDS_SYNC_ACCOUNT_SYNCING_TO_USER,
+ user_name,
+ ASCIIToUTF16(chrome::kSyncGoogleDashboardURL)));
+ }
string16 start_stop_button_label;
bool is_start_stop_button_visible = false;

Powered by Google App Engine
This is Rietveld 408576698