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/app | |
| 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/app')
| -rw-r--r-- | chrome/app/generated_resources.grd | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd index bb6ed9e..6aad21b 100644 --- a/chrome/app/generated_resources.grd +++ b/chrome/app/generated_resources.grd @@ -4659,6 +4659,9 @@ Keep your key file in a safe place. You will need it to create new versions of y <message name="IDS_SYNC_START_SYNC_BUTTON_LABEL" desc="The label that appears on the sync button in the options dialog when sync has not been set up by the user."> Synchronize my bookmarks... </message> + <message name="IDS_SYNC_SETUP_ERROR" desc="The message displayed when an unspecified but unrecoverable error occurs during sync setup."> + An error occurred while trying to set up sync. + </message> <message name="IDS_SYNC_ACCOUNT_SYNCED_TO_USER_WITH_TIME" desc="The message that appears in the options dialog indicating that account is synced to a user with the given email address. The last sync also appears in the message."> Synced to <ph name="USER_EMAIL_ADDRESS">$1<ex>foo@gmail.com</ex></ph>\nLast synced: <ph name="LAST_SYNC_TIME">$2<ex>12 seconds ago</ex></ph> </message> |