| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "chrome/browser/ui/ash/system_tray_delegate_linux.h" | 5 #include "chrome/browser/ui/ash/system_tray_delegate_linux.h" |
| 6 | 6 |
| 7 #include <string> | 7 #include <string> |
| 8 | 8 |
| 9 #include "ash/shell.h" | 9 #include "ash/shell.h" |
| 10 #include "ash/shell_delegate.h" | 10 #include "ash/shell_delegate.h" |
| (...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 64 } | 64 } |
| 65 | 65 |
| 66 virtual const std::string GetEnterpriseDomain() const OVERRIDE { | 66 virtual const std::string GetEnterpriseDomain() const OVERRIDE { |
| 67 return std::string(); | 67 return std::string(); |
| 68 } | 68 } |
| 69 | 69 |
| 70 virtual const base::string16 GetEnterpriseMessage() const OVERRIDE { | 70 virtual const base::string16 GetEnterpriseMessage() const OVERRIDE { |
| 71 return base::string16(); | 71 return base::string16(); |
| 72 } | 72 } |
| 73 | 73 |
| 74 virtual const std::string GetLocallyManagedUserManager() const OVERRIDE { | 74 virtual const std::string GetSupervisedUserManager() const OVERRIDE { |
| 75 return std::string(); | 75 return std::string(); |
| 76 } | 76 } |
| 77 | 77 |
| 78 virtual const base::string16 GetLocallyManagedUserManagerName() const | 78 virtual const base::string16 GetSupervisedUserManagerName() const OVERRIDE { |
| 79 OVERRIDE { | |
| 80 return base::string16(); | 79 return base::string16(); |
| 81 } | 80 } |
| 82 | 81 |
| 83 virtual const base::string16 GetLocallyManagedUserMessage() const OVERRIDE { | 82 virtual const base::string16 GetSupervisedUserMessage() const OVERRIDE { |
| 84 return base::string16(); | 83 return base::string16(); |
| 85 } | 84 } |
| 86 | 85 |
| 87 virtual bool SystemShouldUpgrade() const OVERRIDE { | 86 virtual bool SystemShouldUpgrade() const OVERRIDE { |
| 88 return UpgradeDetector::GetInstance()->notify_upgrade(); | 87 return UpgradeDetector::GetInstance()->notify_upgrade(); |
| 89 } | 88 } |
| 90 | 89 |
| 91 virtual base::HourClockType GetHourClockType() const OVERRIDE { | 90 virtual base::HourClockType GetHourClockType() const OVERRIDE { |
| 92 return clock_type_; | 91 return clock_type_; |
| 93 } | 92 } |
| (...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 139 | 138 |
| 140 virtual void ShowAccessibilityHelp() OVERRIDE { | 139 virtual void ShowAccessibilityHelp() OVERRIDE { |
| 141 } | 140 } |
| 142 | 141 |
| 143 virtual void ShowAccessibilitySettings() OVERRIDE { | 142 virtual void ShowAccessibilitySettings() OVERRIDE { |
| 144 } | 143 } |
| 145 | 144 |
| 146 virtual void ShowPublicAccountInfo() OVERRIDE { | 145 virtual void ShowPublicAccountInfo() OVERRIDE { |
| 147 } | 146 } |
| 148 | 147 |
| 149 virtual void ShowLocallyManagedUserInfo() OVERRIDE { | 148 virtual void ShowSupervisedUserInfo() OVERRIDE { |
| 150 } | 149 } |
| 151 | 150 |
| 152 virtual void ShowEnterpriseInfo() OVERRIDE { | 151 virtual void ShowEnterpriseInfo() OVERRIDE { |
| 153 } | 152 } |
| 154 | 153 |
| 155 virtual void ShowUserLogin() OVERRIDE { | 154 virtual void ShowUserLogin() OVERRIDE { |
| 156 } | 155 } |
| 157 | 156 |
| 158 virtual bool ShowSpringChargerReplacementDialog() OVERRIDE { | 157 virtual bool ShowSpringChargerReplacementDialog() OVERRIDE { |
| 159 return false; | 158 return false; |
| (...skipping 182 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 342 | 341 |
| 343 DISALLOW_COPY_AND_ASSIGN(SystemTrayDelegateLinux); | 342 DISALLOW_COPY_AND_ASSIGN(SystemTrayDelegateLinux); |
| 344 }; | 343 }; |
| 345 | 344 |
| 346 } // namespace | 345 } // namespace |
| 347 | 346 |
| 348 | 347 |
| 349 ash::SystemTrayDelegate* CreateLinuxSystemTrayDelegate() { | 348 ash::SystemTrayDelegate* CreateLinuxSystemTrayDelegate() { |
| 350 return new SystemTrayDelegateLinux(); | 349 return new SystemTrayDelegateLinux(); |
| 351 } | 350 } |
| OLD | NEW |