summaryrefslogtreecommitdiffstats
path: root/chrome/browser/ui/ash/system_tray_delegate_win.cc
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/browser/ui/ash/system_tray_delegate_win.cc')
-rw-r--r--chrome/browser/ui/ash/system_tray_delegate_win.cc13
1 files changed, 7 insertions, 6 deletions
diff --git a/chrome/browser/ui/ash/system_tray_delegate_win.cc b/chrome/browser/ui/ash/system_tray_delegate_win.cc
index 31a09a2..90069ca 100644
--- a/chrome/browser/ui/ash/system_tray_delegate_win.cc
+++ b/chrome/browser/ui/ash/system_tray_delegate_win.cc
@@ -72,20 +72,21 @@ class SystemTrayDelegateWin : public ash::SystemTrayDelegate,
return std::string();
}
- virtual const string16 GetEnterpriseMessage() const OVERRIDE {
- return string16();
+ virtual const base::string16 GetEnterpriseMessage() const OVERRIDE {
+ return base::string16();
}
virtual const std::string GetLocallyManagedUserManager() const OVERRIDE {
return std::string();
}
- virtual const string16 GetLocallyManagedUserManagerName() const OVERRIDE {
- return string16();
+ virtual const base::string16 GetLocallyManagedUserManagerName() const
+ OVERRIDE {
+ return base::string16();
}
- virtual const string16 GetLocallyManagedUserMessage() const OVERRIDE {
- return string16();
+ virtual const base::string16 GetLocallyManagedUserMessage() const OVERRIDE {
+ return base::string16();
}
virtual bool SystemShouldUpgrade() const OVERRIDE {