| 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 65 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 76 } | 76 } |
| 77 | 77 |
| 78 virtual const base::string16 GetSupervisedUserManagerName() const OVERRIDE { | 78 virtual const base::string16 GetSupervisedUserManagerName() const OVERRIDE { |
| 79 return base::string16(); | 79 return base::string16(); |
| 80 } | 80 } |
| 81 | 81 |
| 82 virtual const base::string16 GetSupervisedUserMessage() const OVERRIDE { | 82 virtual const base::string16 GetSupervisedUserMessage() const OVERRIDE { |
| 83 return base::string16(); | 83 return base::string16(); |
| 84 } | 84 } |
| 85 | 85 |
| 86 virtual bool IsUserSupervised() const OVERRIDE { | |
| 87 return false; | |
| 88 } | |
| 89 | |
| 90 virtual bool SystemShouldUpgrade() const OVERRIDE { | 86 virtual bool SystemShouldUpgrade() const OVERRIDE { |
| 91 return UpgradeDetector::GetInstance()->notify_upgrade(); | 87 return UpgradeDetector::GetInstance()->notify_upgrade(); |
| 92 } | 88 } |
| 93 | 89 |
| 94 virtual base::HourClockType GetHourClockType() const OVERRIDE { | 90 virtual base::HourClockType GetHourClockType() const OVERRIDE { |
| 95 return clock_type_; | 91 return clock_type_; |
| 96 } | 92 } |
| 97 | 93 |
| 98 virtual void ShowSettings() OVERRIDE { | 94 virtual void ShowSettings() OVERRIDE { |
| 99 } | 95 } |
| (...skipping 235 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 335 | 331 |
| 336 DISALLOW_COPY_AND_ASSIGN(SystemTrayDelegateLinux); | 332 DISALLOW_COPY_AND_ASSIGN(SystemTrayDelegateLinux); |
| 337 }; | 333 }; |
| 338 | 334 |
| 339 } // namespace | 335 } // namespace |
| 340 | 336 |
| 341 | 337 |
| 342 ash::SystemTrayDelegate* CreateLinuxSystemTrayDelegate() { | 338 ash::SystemTrayDelegate* CreateLinuxSystemTrayDelegate() { |
| 343 return new SystemTrayDelegateLinux(); | 339 return new SystemTrayDelegateLinux(); |
| 344 } | 340 } |
| OLD | NEW |