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

Unified Diff: chrome/browser/sync/sync_ui_util.cc

Issue 6973043: [Sync] Tweaks to About tab of chrome://sync-internals (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 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
« no previous file with comments | « chrome/browser/resources/sync_internals/about.html ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/sync/sync_ui_util.cc
diff --git a/chrome/browser/sync/sync_ui_util.cc b/chrome/browser/sync/sync_ui_util.cc
index 8f60271d6c667139e5eed2955fd66945dd089fb6..9d1ec6e9c4947c6f434a761df38cef1ed8c669fc 100644
--- a/chrome/browser/sync/sync_ui_util.cc
+++ b/chrome/browser/sync/sync_ui_util.cc
@@ -344,6 +344,8 @@ void ConstructAboutInformation(ProfileSyncService* service,
ListValue* details = new ListValue();
strings->Set("details", details);
+ sync_ui_util::AddBoolSyncDetail(details, "Sync Initialized",
+ service->sync_initialized());
sync_ui_util::AddBoolSyncDetail(details, "Sync Setup Has Completed",
service->HasSyncSetupCompleted());
sync_ui_util::AddBoolSyncDetail(details,
@@ -401,15 +403,15 @@ void ConstructAboutInformation(ProfileSyncService* service,
if (service->unrecoverable_error_detected()) {
strings->Set("unrecoverable_error_detected", new FundamentalValue(true));
- strings->SetString("unrecoverable_error_message",
- service->unrecoverable_error_message());
tracked_objects::Location loc(service->unrecoverable_error_location());
std::string location_str;
loc.Write(true, true, &location_str);
- strings->SetString("unrecoverable_error_location", location_str);
- } else if (!service->sync_initialized()) {
- strings->SetString("summary", "Sync not yet initialized");
- } else {
+ std::string unrecoverable_error_message =
+ "Unrecoverable error detected at " + location_str +
+ ": " + service->unrecoverable_error_message();
+ strings->SetString("unrecoverable_error_message",
+ unrecoverable_error_message);
+ } else if (service->sync_initialized()) {
browser_sync::ModelSafeRoutingInfo routes;
service->GetModelSafeRoutingInfo(&routes);
ListValue* routing_info = new ListValue();
« no previous file with comments | « chrome/browser/resources/sync_internals/about.html ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698