OLD | NEW |
1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 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_client.h" | 5 #include "chrome/browser/ui/ash/system_tray_client.h" |
6 | 6 |
7 #include "ash/common/login_status.h" | 7 #include "ash/common/login_status.h" |
8 #include "ash/common/session/session_state_delegate.h" | 8 #include "ash/common/session/session_state_delegate.h" |
9 #include "ash/common/wm_shell.h" | 9 #include "ash/common/wm_shell.h" |
10 #include "ash/public/cpp/shell_window_ids.h" | 10 #include "ash/public/cpp/shell_window_ids.h" |
(...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
91 case LoginState::LOGGED_IN_USER_OWNER: | 91 case LoginState::LOGGED_IN_USER_OWNER: |
92 return ash::LoginStatus::OWNER; | 92 return ash::LoginStatus::OWNER; |
93 case LoginState::LOGGED_IN_USER_GUEST: | 93 case LoginState::LOGGED_IN_USER_GUEST: |
94 return ash::LoginStatus::GUEST; | 94 return ash::LoginStatus::GUEST; |
95 case LoginState::LOGGED_IN_USER_PUBLIC_ACCOUNT: | 95 case LoginState::LOGGED_IN_USER_PUBLIC_ACCOUNT: |
96 return ash::LoginStatus::PUBLIC; | 96 return ash::LoginStatus::PUBLIC; |
97 case LoginState::LOGGED_IN_USER_SUPERVISED: | 97 case LoginState::LOGGED_IN_USER_SUPERVISED: |
98 return ash::LoginStatus::SUPERVISED; | 98 return ash::LoginStatus::SUPERVISED; |
99 case LoginState::LOGGED_IN_USER_KIOSK_APP: | 99 case LoginState::LOGGED_IN_USER_KIOSK_APP: |
100 return ash::LoginStatus::KIOSK_APP; | 100 return ash::LoginStatus::KIOSK_APP; |
| 101 case LoginState::LOGGED_IN_USER_ARC_KIOSK_APP: |
| 102 return ash::LoginStatus::ARC_KIOSK_APP; |
101 } | 103 } |
102 NOTREACHED(); | 104 NOTREACHED(); |
103 return ash::LoginStatus::NOT_LOGGED_IN; | 105 return ash::LoginStatus::NOT_LOGGED_IN; |
104 } | 106 } |
105 | 107 |
106 // static | 108 // static |
107 int SystemTrayClient::GetDialogParentContainerId() { | 109 int SystemTrayClient::GetDialogParentContainerId() { |
108 const ash::LoginStatus login_status = GetUserLoginStatus(); | 110 const ash::LoginStatus login_status = GetUserLoginStatus(); |
109 if (login_status == ash::LoginStatus::NOT_LOGGED_IN || | 111 if (login_status == ash::LoginStatus::NOT_LOGGED_IN || |
110 login_status == ash::LoginStatus::LOCKED) { | 112 login_status == ash::LoginStatus::LOCKED) { |
(...skipping 156 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
267 connector->ConnectToInterface("service:content_browser", &system_tray_); | 269 connector->ConnectToInterface("service:content_browser", &system_tray_); |
268 | 270 |
269 // Tolerate ash crashing and coming back up. | 271 // Tolerate ash crashing and coming back up. |
270 system_tray_.set_connection_error_handler(base::Bind( | 272 system_tray_.set_connection_error_handler(base::Bind( |
271 &SystemTrayClient::OnClientConnectionError, base::Unretained(this))); | 273 &SystemTrayClient::OnClientConnectionError, base::Unretained(this))); |
272 } | 274 } |
273 | 275 |
274 void SystemTrayClient::OnClientConnectionError() { | 276 void SystemTrayClient::OnClientConnectionError() { |
275 system_tray_.reset(); | 277 system_tray_.reset(); |
276 } | 278 } |
OLD | NEW |