diff options
| author | Torne (Richard Coles) <torne@google.com> | 2014-02-21 12:16:55 +0000 |
|---|---|---|
| committer | Torne (Richard Coles) <torne@google.com> | 2014-02-21 12:16:55 +0000 |
| commit | 5d1f7b1de12d16ceb2c938c56701a3e8bfa558f7 (patch) | |
| tree | 5d4ae202b870bd86673f596f0d424bc4b3e55ebe /chrome/browser/signin/signin_ui_util.h | |
| parent | e862bac9c33104a29d98631d62668ae7b6676510 (diff) | |
| download | chromium_org-5d1f7b1de12d16ceb2c938c56701a3e8bfa558f7.tar.gz | |
Merge from Chromium at DEPS revision 251904
This commit was generated by merge_to_master.py.
Change-Id: I1f9543259d7d2a57d81aa41a1b84f85837439d21
Diffstat (limited to 'chrome/browser/signin/signin_ui_util.h')
| -rw-r--r-- | chrome/browser/signin/signin_ui_util.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/browser/signin/signin_ui_util.h b/chrome/browser/signin/signin_ui_util.h index ac316acb71..12731b84a2 100644 --- a/chrome/browser/signin/signin_ui_util.h +++ b/chrome/browser/signin/signin_ui_util.h @@ -26,7 +26,7 @@ std::vector<GlobalError*> GetSignedInServiceErrors(Profile* profile); // Return the label that should be displayed in the signin menu (i.e. // "Sign in to Chromium", "Signin Error...", etc). -string16 GetSigninMenuLabel(Profile* profile); +base::string16 GetSigninMenuLabel(Profile* profile); void GetStatusLabelsForAuthError(Profile* profile, const SigninManagerBase& signin_manager, |