summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
authorzork@chromium.org <zork@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-12-22 21:14:53 +0000
committerzork@chromium.org <zork@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-12-22 21:14:53 +0000
commit139bd735c970b36a4898077d6010595da0194442 (patch)
tree4dbf123eab78c7f36e8c28520d91a9f103787c17 /chrome
parentb5c4ef70068ba850a5b3e6fc494bd2396c9bb1a0 (diff)
downloadchromium_src-139bd735c970b36a4898077d6010595da0194442.zip
chromium_src-139bd735c970b36a4898077d6010595da0194442.tar.gz
chromium_src-139bd735c970b36a4898077d6010595da0194442.tar.bz2
Fix a crash when you use incorrect credentials to log into bookmark sync.
BUG=none TEST=Attempt to sync your bookmarks, but supply an incorrect password. Review URL: http://codereview.chromium.org/501177 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@35169 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
-rw-r--r--chrome/browser/sync/sync_ui_util.cc3
1 files changed, 1 insertions, 2 deletions
diff --git a/chrome/browser/sync/sync_ui_util.cc b/chrome/browser/sync/sync_ui_util.cc
index 56f6915..c82482a 100644
--- a/chrome/browser/sync/sync_ui_util.cc
+++ b/chrome/browser/sync/sync_ui_util.cc
@@ -122,8 +122,8 @@ MessageType GetStatusInfo(ProfileSyncService* service,
} else if (auth_error.state() != AuthError::NONE) {
if (status_label) {
status_label->clear();
+ GetStatusLabelsForAuthError(auth_error, service, status_label, NULL);
}
- GetStatusLabelsForAuthError(auth_error, service, status_label, NULL);
result_type = SYNC_ERROR;
} else if (!status.authenticated) {
if (status_label) {
@@ -177,4 +177,3 @@ void OpenSyncMyBookmarksDialog(
}
} // namespace sync_ui_util
-