summaryrefslogtreecommitdiffstats
path: root/chrome/browser/sync
diff options
context:
space:
mode:
authoridana@chromium.org <idana@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-08-11 02:17:22 +0000
committeridana@chromium.org <idana@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-08-11 02:17:22 +0000
commitfb68e2aa45a49fb36cf0be8a0188955f610554f0 (patch)
treee8f8bca9d0487833cc340fd9d8610bf2ba7e62fe /chrome/browser/sync
parent1f97a11d47048f09134e36265661c1082d1f82d3 (diff)
downloadchromium_src-fb68e2aa45a49fb36cf0be8a0188955f610554f0.zip
chromium_src-fb68e2aa45a49fb36cf0be8a0188955f610554f0.tar.gz
chromium_src-fb68e2aa45a49fb36cf0be8a0188955f610554f0.tar.bz2
Added a button to the bookmark bar which shows up when the sync
login credentials expire and we need the user to re-enter their password. Review URL: http://codereview.chromium.org/164278 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@23002 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/sync')
-rw-r--r--chrome/browser/sync/personalization_strings.h5
-rw-r--r--chrome/browser/sync/sync_status_ui_helper.cc2
2 files changed, 5 insertions, 2 deletions
diff --git a/chrome/browser/sync/personalization_strings.h b/chrome/browser/sync/personalization_strings.h
index 05e3da7..2dd67aa 100644
--- a/chrome/browser/sync/personalization_strings.h
+++ b/chrome/browser/sync/personalization_strings.h
@@ -56,6 +56,11 @@ static const wchar_t kMenuLabelStartSync[] = L"Sync my bookmarks...";
// Login dialog strings.
static const wchar_t kLoginDialogTitle[] = L"Sync my bookmarks";
+// Bookmark bar strings.
+static const wchar_t kBookmarkBarSyncErrorButtonText[] = L"Sync Error";
+static const wchar_t kBookmarkBarErrorTooltip[] =
+ L"Your login details are out of date. Click to re-enter your password.";
+
#endif // CHROME_BROWSER_SYNC_PERSONALIZATION_STRINGS_H_
#endif // CHROME_PERSONALIZATION
diff --git a/chrome/browser/sync/sync_status_ui_helper.cc b/chrome/browser/sync/sync_status_ui_helper.cc
index 93acf47..586cd6f 100644
--- a/chrome/browser/sync/sync_status_ui_helper.cc
+++ b/chrome/browser/sync/sync_status_ui_helper.cc
@@ -78,8 +78,6 @@ SyncStatusUIHelper::MessageType SyncStatusUIHelper::GetLabels(
} else if (auth_error != AUTH_ERROR_NONE) {
GetLabelsForAuthError(auth_error, service, status_label, link_label);
result_type = SYNC_ERROR;
- } else {
- NOTREACHED() << "Setup complete, backend !authenticated, AUTH_ERROR_NONE";
}
} else {
// Either show auth error information with a link to re-login, auth in prog,