Tray message changed for child accounts. Warning bubble removed for child accounts.

chrome/browser/ui/ash/system_tray_delegate_chromeos.h

Index: chrome/browser/ui/ash/system_tray_delegate_chromeos.h
diff --git a/chrome/browser/ui/ash/system_tray_delegate_chromeos.h b/chrome/browser/ui/ash/system_tray_delegate_chromeos.h
index 85280f882f25d04f5ecc0f26f84ed9f6ec8a5166..7a2ee9c3453637ed9ee8559b127bd3d8f809235e 100644
--- a/chrome/browser/ui/ash/system_tray_delegate_chromeos.h
+++ b/chrome/browser/ui/ash/system_tray_delegate_chromeos.h
@@ -78,6 +78,7 @@ class SystemTrayDelegateChromeOS
   const base::string16 GetSupervisedUserManagerName() const override;
   const base::string16 GetSupervisedUserMessage() const override;
   bool IsUserSupervised() const override;
+  bool IsUserChild() const override;
   void GetSystemUpdateInfo(ash::UpdateInfo* info) const override;
   base::HourClockType GetHourClockType() const override;
   void ShowSettings() override;
@@ -252,6 +253,10 @@ class SystemTrayDelegateChromeOS
   void OnAccessibilityStatusChanged(
       const AccessibilityStatusEventDetails& details);
 
+  // helper methods used by GetSupervisedUserMessage.
+  const base::string16 GetLegacySupervisedUserMessage() const;
+  const base::string16 GetChildUserMessage() const;
+
   scoped_ptr<content::NotificationRegistrar> registrar_;
   scoped_ptr<PrefChangeRegistrar> local_state_registrar_;
   scoped_ptr<PrefChangeRegistrar> user_pref_registrar_;