summaryrefslogtreecommitdiff
path: root/chrome/browser/signin/signin_ui_util.h
diff options
context:
space:
mode:
authorPrimiano Tucci <primiano@google.com>2014-09-30 14:45:55 +0100
committerPrimiano Tucci <primiano@google.com>2014-09-30 14:45:55 +0100
commit1320f92c476a1ad9d19dba2a48c72b75566198e9 (patch)
treeea7f149ccad687b22c18a72b729646568b2d54fb /chrome/browser/signin/signin_ui_util.h
parent39b78c562f50ad7d5551ee861121f899239525a2 (diff)
downloadchromium_org-1320f92c476a1ad9d19dba2a48c72b75566198e9.tar.gz
Merge from Chromium at DEPS revision 267aeeb8d85c
This commit was generated by merge_to_master.py. Change-Id: Id3aac9713b301fae64408cdaee0888724eeb7c0e
Diffstat (limited to 'chrome/browser/signin/signin_ui_util.h')
-rw-r--r--chrome/browser/signin/signin_ui_util.h6
1 files changed, 6 insertions, 0 deletions
diff --git a/chrome/browser/signin/signin_ui_util.h b/chrome/browser/signin/signin_ui_util.h
index 68010c92ee..943573801c 100644
--- a/chrome/browser/signin/signin_ui_util.h
+++ b/chrome/browser/signin/signin_ui_util.h
@@ -42,6 +42,12 @@ void InitializePrefsForProfile(Profile* profile);
// Shows a learn more page for signin errors.
void ShowSigninErrorLearnMorePage(Profile* profile);
+// Returns the display email string for the given account. If the profile
+// has not been migrated to use gaia ids, then its possible for the display
+// to not ne known yet. In this case, use |account_id|, which is assumed to
+// be an email address.
+std::string GetDisplayEmail(Profile* profile, const std::string& account_id);
+
} // namespace signin_ui_util
#endif // CHROME_BROWSER_SIGNIN_SIGNIN_UI_UTIL_H_