diff options
| author | Torne (Richard Coles) <torne@google.com> | 2013-12-18 16:25:09 +0000 |
|---|---|---|
| committer | Torne (Richard Coles) <torne@google.com> | 2013-12-18 16:25:09 +0000 |
| commit | a3f6a49ab37290eeeb8db0f41ec0f1cb74a68be7 (patch) | |
| tree | dafc1c6417406a7fbd422ad0bb890e96909ef564 /chrome/browser/signin/signin_ui_util.h | |
| parent | d5f893c0bc79db3066bb5ae5d3d972ba1be7dd5f (diff) | |
| download | chromium_org-a3f6a49ab37290eeeb8db0f41ec0f1cb74a68be7.tar.gz | |
Merge from Chromium at DEPS revision 240154
This commit was generated by merge_to_master.py.
Change-Id: I8f2ba858cf0e7f413dddedc2ae91dc37f7136c2e
Diffstat (limited to 'chrome/browser/signin/signin_ui_util.h')
| -rw-r--r-- | chrome/browser/signin/signin_ui_util.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/signin/signin_ui_util.h b/chrome/browser/signin/signin_ui_util.h index 86034ac87a..ac316acb71 100644 --- a/chrome/browser/signin/signin_ui_util.h +++ b/chrome/browser/signin/signin_ui_util.h @@ -30,8 +30,8 @@ string16 GetSigninMenuLabel(Profile* profile); void GetStatusLabelsForAuthError(Profile* profile, const SigninManagerBase& signin_manager, - string16* status_label, - string16* link_label); + base::string16* status_label, + base::string16* link_label); } // namespace signin_ui_util |