Replace string16 with base::string16.

chrome/browser/chromeos/system/ash_system_tray_delegate.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/chromeos/system/ash_system_tray_delegate.h"
 
 #include <algorithm>
 #include <set>
 #include <string>
 #include <vector>
@@ skipping 406 matching lines @@
     content::RecordAction(
         content::UserMetricsAction("OpenChangeProfilePictureDialog"));
     ShowSettingsSubPageForAppropriateBrowser(
         chrome::kChangeProfilePictureSubPage);
   }
 
   virtual const std::string GetEnterpriseDomain() const OVERRIDE {
     return enterprise_domain_;
   }
 
-  virtual const string16 GetEnterpriseMessage() const OVERRIDE {
+  virtual const base::string16 GetEnterpriseMessage() const OVERRIDE {
     if (GetEnterpriseDomain().empty())
-        return string16();
+        return base::string16();
     return l10n_util::GetStringFUTF16(IDS_DEVICE_OWNED_BY_NOTICE,
                                       UTF8ToUTF16(GetEnterpriseDomain()));
   }
 
   virtual const std::string GetLocallyManagedUserManager() const OVERRIDE {
     if (GetUserLoginStatus() != ash::user::LOGGED_IN_LOCALLY_MANAGED)
       return std::string();
     return UserManager::Get()->GetSupervisedUserManager()->
         GetManagerDisplayEmail(
             chromeos::UserManager::Get()->GetActiveUser()->email());
   }
 
-  virtual const string16 GetLocallyManagedUserManagerName() const OVERRIDE {
+  virtual const base::string16 GetLocallyManagedUserManagerName() const OVERRIDE {
     if (GetUserLoginStatus() != ash::user::LOGGED_IN_LOCALLY_MANAGED)
-      return string16();
+      return base::string16();
     return UserManager::Get()->GetSupervisedUserManager()->
         GetManagerDisplayName(
             chromeos::UserManager::Get()->GetActiveUser()->email());
   }
 
-  virtual const string16 GetLocallyManagedUserMessage() const OVERRIDE {
+  virtual const base::string16 GetLocallyManagedUserMessage() const OVERRIDE {
     if (GetUserLoginStatus() != ash::user::LOGGED_IN_LOCALLY_MANAGED)
-        return string16();
+        return base::string16();
     return l10n_util::GetStringFUTF16(
         IDS_USER_IS_LOCALLY_MANAGED_BY_NOTICE,
         UTF8ToUTF16(GetLocallyManagedUserManager()));
   }
 
   virtual bool SystemShouldUpgrade() const OVERRIDE {
     return UpgradeDetector::GetInstance()->notify_upgrade();
   }
 
   virtual base::HourClockType GetHourClockType() const OVERRIDE {
@@ skipping 775 matching lines @@
   DISALLOW_COPY_AND_ASSIGN(SystemTrayDelegate);
 };
 
 }  // namespace
 
 ash::SystemTrayDelegate* CreateSystemTrayDelegate() {
   return new chromeos::SystemTrayDelegate();
 }
 
 }  // namespace chromeos