diff options
| author | tim@chromium.org <tim@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-16 22:33:33 +0000 |
|---|---|---|
| committer | tim@chromium.org <tim@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-16 22:33:33 +0000 |
| commit | fb42c9807220ebff48f2a05641e2c1bdc97714d2 (patch) | |
| tree | 8129dc80409f4d3ec332e58f97a8b069ff5b9006 /chrome/browser/sync/resources | |
| parent | d78892e3e97a2d46d52f904ce7f5df754e28694f (diff) | |
| download | chromium_src-fb42c9807220ebff48f2a05641e2c1bdc97714d2.zip chromium_src-fb42c9807220ebff48f2a05641e2c1bdc97714d2.tar.gz chromium_src-fb42c9807220ebff48f2a05641e2c1bdc97714d2.tar.bz2 | |
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
Diffstat (limited to 'chrome/browser/sync/resources')
| -rw-r--r-- | chrome/browser/sync/resources/merge_and_sync.html | 8 |
1 files changed, 8 insertions, 0 deletions
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 = + "<font size='-1'><b>" + templateData['setuperror'] + "</b></font>"; + } + </script> </HEAD> <BODY onload="setInterval(advanceThrobber, 30);"> |