Chromium Code Reviews| 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/chromeos/app_mode/arc/arc_kiosk_app_manager.h> | 5 #include <chrome/browser/chromeos/app_mode/arc/arc_kiosk_app_manager.h> |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 #include <utility> | 8 #include <utility> |
| 9 | 9 |
| 10 #include "base/barrier_closure.h" | 10 #include "base/barrier_closure.h" |
| (...skipping 152 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 163 } | 163 } |
| 164 | 164 |
| 165 void ArcKioskAppManager::AddObserver(ArcKioskAppManagerObserver* observer) { | 165 void ArcKioskAppManager::AddObserver(ArcKioskAppManagerObserver* observer) { |
| 166 observers_.AddObserver(observer); | 166 observers_.AddObserver(observer); |
| 167 } | 167 } |
| 168 | 168 |
| 169 void ArcKioskAppManager::RemoveObserver(ArcKioskAppManagerObserver* observer) { | 169 void ArcKioskAppManager::RemoveObserver(ArcKioskAppManagerObserver* observer) { |
| 170 observers_.RemoveObserver(observer); | 170 observers_.RemoveObserver(observer); |
| 171 } | 171 } |
| 172 | 172 |
| 173 void ArcKioskAppManager::SetWasAutoLaunchedWithZeroDelay( | |
| 174 const AccountId& account_id) { | |
| 175 currently_auto_launched_with_zero_delay_account_id_ = account_id; | |
| 176 } | |
| 177 | |
| 178 const AccountId& ArcKioskAppManager::GetWasAutoLaunchedWithZeroDelay() | |
| 179 const { | |
| 180 return currently_auto_launched_with_zero_delay_account_id_; | |
|
Ivan Šandrk
2017/03/16 18:30:43
Second option is I don't set a boolean flag at all
| |
| 181 } | |
| 182 | |
| 173 void ArcKioskAppManager::UpdateApps() { | 183 void ArcKioskAppManager::UpdateApps() { |
| 174 // Do not populate ARC kiosk apps if ARC kiosk apps can't be run on the | 184 // Do not populate ARC kiosk apps if ARC kiosk apps can't be run on the |
| 175 // device. | 185 // device. |
| 176 // Apps won't be added to kiosk Apps menu and won't be auto-launched. | 186 // Apps won't be added to kiosk Apps menu and won't be auto-launched. |
| 177 if (!arc::IsArcKioskAvailable()) { | 187 if (!arc::IsArcKioskAvailable()) { |
| 178 VLOG(1) << "Device doesn't support ARC kiosk"; | 188 VLOG(1) << "Device doesn't support ARC kiosk"; |
| 179 return; | 189 return; |
| 180 } | 190 } |
| 181 | 191 |
| 182 // Store current apps. We will compare old and new apps to determine which | 192 // Store current apps. We will compare old and new apps to determine which |
| (...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 250 cryptohome_id, base::Bind(&OnRemoveAppCryptohomeComplete, | 260 cryptohome_id, base::Bind(&OnRemoveAppCryptohomeComplete, |
| 251 cryptohome_id, base::Closure())); | 261 cryptohome_id, base::Closure())); |
| 252 } | 262 } |
| 253 } | 263 } |
| 254 | 264 |
| 255 if (active_user_to_be_deleted) | 265 if (active_user_to_be_deleted) |
| 256 chrome::AttemptUserExit(); | 266 chrome::AttemptUserExit(); |
| 257 } | 267 } |
| 258 | 268 |
| 259 } // namespace chromeos | 269 } // namespace chromeos |
| OLD | NEW |