diff options
| author | lipalani@chromium.org <lipalani@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-06 00:09:36 +0000 |
|---|---|---|
| committer | lipalani@chromium.org <lipalani@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-06 00:09:36 +0000 |
| commit | cd2ec4bce32b559b5daa47de815a31fc6d469517 (patch) | |
| tree | 2fd8e924c01c05a32889ad91b31c5adb09881ca1 /chrome/browser/sync/sync_ui_util.cc | |
| parent | 21942192906ea1fe88dde43a0d34fee79d68f97d (diff) | |
| download | chromium_src-cd2ec4bce32b559b5daa47de815a31fc6d469517.zip chromium_src-cd2ec4bce32b559b5daa47de815a31fc6d469517.tar.gz chromium_src-cd2ec4bce32b559b5daa47de815a31fc6d469517.tar.bz2 | |
Fixing the crash in about:sync code. This was caused by a race condition.
BUG=65370
TEST=
Review URL: http://codereview.chromium.org/6074006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@70561 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/sync/sync_ui_util.cc')
| -rw-r--r-- | chrome/browser/sync/sync_ui_util.cc | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/chrome/browser/sync/sync_ui_util.cc b/chrome/browser/sync/sync_ui_util.cc index 27fdb9a..43a97d0 100644 --- a/chrome/browser/sync/sync_ui_util.cc +++ b/chrome/browser/sync/sync_ui_util.cc @@ -322,6 +322,12 @@ void ConstructAboutInformation(ProfileSyncService* service, 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 if (service->backend() == NULL) { + strings->SetString("summary", + "Unrecoverable error detected. Backend is null when it shouldnt be"); + NOTREACHED(); } else { browser_sync::ModelSafeRoutingInfo routes; service->backend()->GetModelSafeRoutingInfo(&routes); |