OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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_win.h" | 5 #include "chrome/browser/ui/ash/system_tray_delegate_win.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 |
86 virtual bool SystemShouldUpgrade() const OVERRIDE { | 90 virtual bool SystemShouldUpgrade() const OVERRIDE { |
87 return UpgradeDetector::GetInstance()->notify_upgrade(); | 91 return UpgradeDetector::GetInstance()->notify_upgrade(); |
88 } | 92 } |
89 | 93 |
90 virtual base::HourClockType GetHourClockType() const OVERRIDE { | 94 virtual base::HourClockType GetHourClockType() const OVERRIDE { |
91 return clock_type_; | 95 return clock_type_; |
92 } | 96 } |
93 | 97 |
94 virtual void ShowSettings() OVERRIDE { | 98 virtual void ShowSettings() OVERRIDE { |
95 } | 99 } |
(...skipping 232 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
328 | 332 |
329 DISALLOW_COPY_AND_ASSIGN(SystemTrayDelegateWin); | 333 DISALLOW_COPY_AND_ASSIGN(SystemTrayDelegateWin); |
330 }; | 334 }; |
331 | 335 |
332 } // namespace | 336 } // namespace |
333 | 337 |
334 | 338 |
335 ash::SystemTrayDelegate* CreateWindowsSystemTrayDelegate() { | 339 ash::SystemTrayDelegate* CreateWindowsSystemTrayDelegate() { |
336 return new SystemTrayDelegateWin(); | 340 return new SystemTrayDelegateWin(); |
337 } | 341 } |
OLD | NEW |