From fb42c9807220ebff48f2a05641e2c1bdc97714d2 Mon Sep 17 00:00:00 2001 From: "tim@chromium.org" Date: Wed, 16 Sep 2009 22:33:33 +0000 Subject: Handle some startup errors encountered by ModelAssociator (such as unable to find tagged nodes) more gracefully by triggering the unrecoverable error handler. This was in response to a suggestion from chron, as we seem to hit this case a fair bit, and crashing is a pain. More importantly it's possible users are hitting it as well and having an explicit error case / message hidden on the options dialog is better than silently failing with no inkling as to what happened. It also just seems preferable to be in the PSS error state when this happens. Review URL: http://codereview.chromium.org/201119 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@26407 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/browser/sync/resources/merge_and_sync.html | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'chrome/browser/sync/resources') diff --git a/chrome/browser/sync/resources/merge_and_sync.html b/chrome/browser/sync/resources/merge_and_sync.html index ec0e299..6864c7f 100644 --- a/chrome/browser/sync/resources/merge_and_sync.html +++ b/chrome/browser/sync/resources/merge_and_sync.html @@ -33,6 +33,14 @@ closebutton.value = document.getElementById("close_txt").innerHTML; setTimeout(Close, 1600); } + + function showMergeAndSyncError() { + var throbber = document.getElementById('throbber_container'); + throbber.style.display = "none"; + document.getElementById("header").innerHTML = + "" + templateData['setuperror'] + ""; + } + -- cgit v1.1