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_global_error.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_global_error.h')
| -rw-r--r-- | chrome/browser/signin/signin_global_error.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/chrome/browser/signin/signin_global_error.h b/chrome/browser/signin/signin_global_error.h index 459fe27ec2..8c9557c732 100644 --- a/chrome/browser/signin/signin_global_error.h +++ b/chrome/browser/signin/signin_global_error.h @@ -54,13 +54,13 @@ class SigninGlobalError : public GlobalErrorWithStandardBubble { // GlobalError implementation. virtual bool HasMenuItem() OVERRIDE; virtual int MenuItemCommandID() OVERRIDE; - virtual string16 MenuItemLabel() OVERRIDE; + virtual base::string16 MenuItemLabel() OVERRIDE; virtual void ExecuteMenuItem(Browser* browser) OVERRIDE; virtual bool HasBubbleView() OVERRIDE; - virtual string16 GetBubbleViewTitle() OVERRIDE; + virtual base::string16 GetBubbleViewTitle() OVERRIDE; virtual std::vector<string16> GetBubbleViewMessages() OVERRIDE; - virtual string16 GetBubbleViewAcceptButtonLabel() OVERRIDE; - virtual string16 GetBubbleViewCancelButtonLabel() OVERRIDE; + virtual base::string16 GetBubbleViewAcceptButtonLabel() OVERRIDE; + virtual base::string16 GetBubbleViewCancelButtonLabel() OVERRIDE; virtual void OnBubbleViewDidClose(Browser* browser) OVERRIDE; virtual void BubbleViewAcceptButtonPressed(Browser* browser) OVERRIDE; virtual void BubbleViewCancelButtonPressed(Browser* browser) OVERRIDE; |