| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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_chromeos.h" | 5 #include "chrome/browser/ui/ash/system_tray_delegate_chromeos.h" |
| 6 | 6 |
| 7 #include <stddef.h> | 7 #include <stddef.h> |
| 8 | 8 |
| 9 #include <algorithm> | 9 #include <algorithm> |
| 10 #include <set> | 10 #include <set> |
| (...skipping 315 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 326 case LoginState::LOGGED_IN_USER_OWNER: | 326 case LoginState::LOGGED_IN_USER_OWNER: |
| 327 return ash::LoginStatus::OWNER; | 327 return ash::LoginStatus::OWNER; |
| 328 case LoginState::LOGGED_IN_USER_GUEST: | 328 case LoginState::LOGGED_IN_USER_GUEST: |
| 329 return ash::LoginStatus::GUEST; | 329 return ash::LoginStatus::GUEST; |
| 330 case LoginState::LOGGED_IN_USER_PUBLIC_ACCOUNT: | 330 case LoginState::LOGGED_IN_USER_PUBLIC_ACCOUNT: |
| 331 return ash::LoginStatus::PUBLIC; | 331 return ash::LoginStatus::PUBLIC; |
| 332 case LoginState::LOGGED_IN_USER_SUPERVISED: | 332 case LoginState::LOGGED_IN_USER_SUPERVISED: |
| 333 return ash::LoginStatus::SUPERVISED; | 333 return ash::LoginStatus::SUPERVISED; |
| 334 case LoginState::LOGGED_IN_USER_KIOSK_APP: | 334 case LoginState::LOGGED_IN_USER_KIOSK_APP: |
| 335 return ash::LoginStatus::KIOSK_APP; | 335 return ash::LoginStatus::KIOSK_APP; |
| 336 case LoginState::LOGGED_IN_USER_ARC_KIOSK_APP: |
| 337 return ash::LoginStatus::ARC_KIOSK_APP; |
| 336 } | 338 } |
| 337 NOTREACHED(); | 339 NOTREACHED(); |
| 338 return ash::LoginStatus::NOT_LOGGED_IN; | 340 return ash::LoginStatus::NOT_LOGGED_IN; |
| 339 } | 341 } |
| 340 | 342 |
| 341 std::string SystemTrayDelegateChromeOS::GetEnterpriseDomain() const { | 343 std::string SystemTrayDelegateChromeOS::GetEnterpriseDomain() const { |
| 342 return enterprise_domain_; | 344 return enterprise_domain_; |
| 343 } | 345 } |
| 344 | 346 |
| 345 base::string16 SystemTrayDelegateChromeOS::GetEnterpriseMessage() const { | 347 base::string16 SystemTrayDelegateChromeOS::GetEnterpriseMessage() const { |
| (...skipping 822 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1168 LOG(WARNING) << "SystemTrayDelegateChromeOS::GetChildUserMessage call while " | 1170 LOG(WARNING) << "SystemTrayDelegateChromeOS::GetChildUserMessage call while " |
| 1169 << "ENABLE_SUPERVISED_USERS undefined."; | 1171 << "ENABLE_SUPERVISED_USERS undefined."; |
| 1170 return base::string16(); | 1172 return base::string16(); |
| 1171 } | 1173 } |
| 1172 | 1174 |
| 1173 ash::SystemTrayDelegate* CreateSystemTrayDelegate() { | 1175 ash::SystemTrayDelegate* CreateSystemTrayDelegate() { |
| 1174 return new SystemTrayDelegateChromeOS(); | 1176 return new SystemTrayDelegateChromeOS(); |
| 1175 } | 1177 } |
| 1176 | 1178 |
| 1177 } // namespace chromeos | 1179 } // namespace chromeos |
| OLD | NEW |