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

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

Issue 7830019: [Sync UI] Show only one sync status on personal options page. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: " Created 9 years, 3 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
« no previous file with comments | « chrome/browser/sync/sync_ui_util.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 5addd11d990f4645198825f83304c339d3c5694e..7c86faff4646a11e8c142ee1b70fad8bd05b2b89 100644
--- a/chrome/browser/ui/webui/options/personal_options_handler.cc
+++ b/chrome/browser/ui/webui/options/personal_options_handler.cc
@@ -239,21 +239,6 @@ void PersonalOptionsHandler::OnStateChanged() {
bool sync_setup_completed = service->HasSyncSetupCompleted();
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();
-
- // TODO(jhawkins): This is terribly hacky. Sync should pass us this state, but
- // we have to fix the other callers of
- // sync_ui_util::GetSyncedStateStatusLabel() to handle returned HTML.
- if (!status_has_error &&
- summary == browser_sync::SyncBackendHost::Status::READY &&
- service->HasSyncSetupCompleted()) {
- string16 user_name(service->GetAuthenticatedUsername());
- status_label.assign(l10n_util::GetStringFUTF16(
- IDS_SYNC_ACCOUNT_SYNCING_TO_USER,
- user_name,
- ASCIIToUTF16(chrome::kSyncGoogleDashboardURL)));
- }
string16 start_stop_button_label;
bool is_start_stop_button_visible = false;
« no previous file with comments | « chrome/browser/sync/sync_ui_util.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698