[Sync] Tweaks to About tab of chrome://sync-internals

chrome/browser/sync/sync_ui_util.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/sync/sync_ui_util.h"
 
 #include "base/command_line.h"
 #include "base/i18n/number_formatting.h"
 #include "base/i18n/time_formatting.h"
 #include "base/string_util.h"
@@ skipping 326 matching lines @@
     strings->Set("authenticated",
                  new FundamentalValue(full_status.authenticated));
     strings->SetString("auth_problem",
                        sync_ui_util::MakeSyncAuthErrorText(
                        service->GetAuthError().state()));
 
     strings->SetString("time_since_sync", service->GetLastSyncedTimeString());
 
     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,
                                     "Server Up",
                                     full_status.server_up);
     sync_ui_util::AddBoolSyncDetail(details,
                                     "Server Reachable",
                                     full_status.server_reachable);
     sync_ui_util::AddBoolSyncDetail(details,
                                     "Server Broken",
@@ skipping 37 matching lines @@
                                    full_status.tombstone_updates_received);
     sync_ui_util::AddBoolSyncDetail(details,
                                     "Disk Full",
                                     full_status.disk_full);
     sync_ui_util::AddIntSyncDetail(details,
                                    "Max Consecutive Errors",
                                    full_status.max_consecutive_errors);
 
     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();
       strings->Set("routing_info", routing_info);
       browser_sync::ModelSafeRoutingInfo::const_iterator it = routes.begin();
       for (; it != routes.end(); ++it) {
         DictionaryValue* val = new DictionaryValue;
         val->SetString("model_type", ModelTypeToString(it->first));
         val->SetString("group", ModelSafeGroupToString(it->second));
         routing_info->Append(val);
@@ skipping 18 matching lines @@
 
       DictionaryValue* val = new DictionaryValue;
       val->SetString("stat_name", "Autofill Migration Time");
       val->SetString("stat_value", ConstructTime(info.autofill_migration_time));
       details->Append(val);
     }
   }
 }
 
 }  // namespace sync_ui_util