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 54 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
65 } | 65 } |
66 | 66 |
67 virtual const std::string GetEnterpriseDomain() const OVERRIDE { | 67 virtual const std::string GetEnterpriseDomain() const OVERRIDE { |
68 return std::string(); | 68 return std::string(); |
69 } | 69 } |
70 | 70 |
71 virtual const base::string16 GetEnterpriseMessage() const OVERRIDE { | 71 virtual const base::string16 GetEnterpriseMessage() const OVERRIDE { |
72 return base::string16(); | 72 return base::string16(); |
73 } | 73 } |
74 | 74 |
75 virtual const std::string GetLocallyManagedUserManager() const OVERRIDE { | 75 virtual const std::string GetSupervisedUserManager() const OVERRIDE { |
76 return std::string(); | 76 return std::string(); |
77 } | 77 } |
78 | 78 |
79 virtual const base::string16 GetLocallyManagedUserManagerName() const | 79 virtual const base::string16 GetSupervisedUserManagerName() const OVERRIDE { |
80 OVERRIDE { | |
81 return base::string16(); | 80 return base::string16(); |
82 } | 81 } |
83 | 82 |
84 virtual const base::string16 GetLocallyManagedUserMessage() const OVERRIDE { | 83 virtual const base::string16 GetSupervisedUserMessage() const OVERRIDE { |
85 return base::string16(); | 84 return base::string16(); |
86 } | 85 } |
87 | 86 |
88 virtual bool SystemShouldUpgrade() const OVERRIDE { | 87 virtual bool SystemShouldUpgrade() const OVERRIDE { |
89 return UpgradeDetector::GetInstance()->notify_upgrade(); | 88 return UpgradeDetector::GetInstance()->notify_upgrade(); |
90 } | 89 } |
91 | 90 |
92 virtual base::HourClockType GetHourClockType() const OVERRIDE { | 91 virtual base::HourClockType GetHourClockType() const OVERRIDE { |
93 return clock_type_; | 92 return clock_type_; |
94 } | 93 } |
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
137 | 136 |
138 virtual void ShowAccessibilityHelp() OVERRIDE { | 137 virtual void ShowAccessibilityHelp() OVERRIDE { |
139 } | 138 } |
140 | 139 |
141 virtual void ShowAccessibilitySettings() OVERRIDE { | 140 virtual void ShowAccessibilitySettings() OVERRIDE { |
142 } | 141 } |
143 | 142 |
144 virtual void ShowPublicAccountInfo() OVERRIDE { | 143 virtual void ShowPublicAccountInfo() OVERRIDE { |
145 } | 144 } |
146 | 145 |
147 virtual void ShowLocallyManagedUserInfo() OVERRIDE { | 146 virtual void ShowSupervisedUserInfo() OVERRIDE { |
148 } | 147 } |
149 | 148 |
150 virtual void ShowEnterpriseInfo() OVERRIDE { | 149 virtual void ShowEnterpriseInfo() OVERRIDE { |
151 } | 150 } |
152 | 151 |
153 virtual void ShowUserLogin() OVERRIDE { | 152 virtual void ShowUserLogin() OVERRIDE { |
154 } | 153 } |
155 | 154 |
156 virtual bool ShowSpringChargerReplacementDialog() OVERRIDE { | 155 virtual bool ShowSpringChargerReplacementDialog() OVERRIDE { |
157 return false; | 156 return false; |
(...skipping 182 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
340 | 339 |
341 DISALLOW_COPY_AND_ASSIGN(SystemTrayDelegateWin); | 340 DISALLOW_COPY_AND_ASSIGN(SystemTrayDelegateWin); |
342 }; | 341 }; |
343 | 342 |
344 } // namespace | 343 } // namespace |
345 | 344 |
346 | 345 |
347 ash::SystemTrayDelegate* CreateWindowsSystemTrayDelegate() { | 346 ash::SystemTrayDelegate* CreateWindowsSystemTrayDelegate() { |
348 return new SystemTrayDelegateWin(); | 347 return new SystemTrayDelegateWin(); |
349 } | 348 } |
OLD | NEW |