Enable screen capture for ARC++ Kiosk

chrome/browser/chromeos/policy/device_status_collector.cc

Index: chrome/browser/chromeos/policy/device_status_collector.cc
diff --git a/chrome/browser/chromeos/policy/device_status_collector.cc b/chrome/browser/chromeos/policy/device_status_collector.cc
index f58540c7465c7d37f9017a7441facb5699d8e249..ef2167c7123841d2be84562f258463f53dcce449 100644
--- a/chrome/browser/chromeos/policy/device_status_collector.cc
+++ b/chrome/browser/chromeos/policy/device_status_collector.cc
@@ -31,6 +31,7 @@
 #include "base/values.h"
 #include "base/version.h"
 #include "chrome/browser/browser_process.h"
+#include "chrome/browser/chromeos/app_mode/arc/arc_kiosk_app_manager.h"
 #include "chrome/browser/chromeos/app_mode/kiosk_app_manager.h"
 #include "chrome/browser/chromeos/login/users/chrome_user_manager.h"
 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h"
@@ -253,8 +254,10 @@ bool ReadAndroidStatus(
 // case we won't report its status).
 std::unique_ptr<policy::DeviceLocalAccount> GetCurrentKioskDeviceLocalAccount(
     chromeos::CrosSettings* settings) {
-  if (!user_manager::UserManager::Get()->IsLoggedInAsKioskApp())
+  if (!user_manager::UserManager::Get()->IsLoggedInAsKioskApp() &&
+      !user_manager::UserManager::Get()->IsLoggedInAsArcKioskApp()) {
     return std::unique_ptr<policy::DeviceLocalAccount>();
+  }
   const user_manager::User* const user =
       user_manager::UserManager::Get()->GetActiveUser();
   const std::vector<policy::DeviceLocalAccount> accounts =
@@ -691,9 +694,11 @@ DeviceStatusCollector::GetAutoLaunchedKioskSessionInfo() {
       GetCurrentKioskDeviceLocalAccount(cros_settings_);
   if (account) {
     chromeos::KioskAppManager::App current_app;
-    if (chromeos::KioskAppManager::Get()->GetApp(account->kiosk_app_id,
-                                                 &current_app) &&
-        current_app.was_auto_launched_with_zero_delay) {
+    if ((chromeos::KioskAppManager::Get()->GetApp(account->kiosk_app_id,

[achuithb, 2017/03/21 00:30:16]

What's the difference between these two conditions?

Adding some temporary booleans would make this more readable.

[Ivan Šandrk, 2017/03/21 12:48:05]

The first one queries the regular kiosk app manager for the current app, and
gets back a structure containing info about the currently running app, and one
of those is whether it was auto launched.

The second one queries the ARC kiosk app manager and directly gets the info
about the currently auto launched app.

So basically the first one is just for regular (legacy) kiosk apps, and the
second one is just for arc kiosk apps.

Done.

+                                                  &current_app) &&
+         current_app.was_auto_launched_with_zero_delay) ||
+        chromeos::ArcKioskAppManager::Get()->
+            current_app_was_auto_launched_with_zero_delay()) {
       return account;
     }
   }