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..06a327b1d4dbb8fcf1f240b87aa5f209cff97537 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,7 +254,8 @@ 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())

[Luis Héctor Chávez, 2017/03/17 17:46:54]

nit: add braces.

re: style guide, I think it's one of those things where the guide is silent
about but most reviewers tend to request it. I'll try to see if there is
consensus to amend the Chromium C++  style guide to explicitly mention this.

[Ivan Šandrk, 2017/03/20 13:22:58]

Done. I'm just wondering what's the reasoning on this one (I like knowing all
the why's behind the rules) :-)

[Luis Héctor Chávez, 2017/03/20 15:09:16]

The rule for eliding braces is that all statements in the if/else chain should
be one-liners for both condition and body.

You can think of brace elision as something to reduce the number of lines needed
to express something, but only when it is totally unambiguous and fits a certain
"visual pattern" that is easily identifiable at a glance. If the condition does
not fit in one line, that visual pattern is lost.

     return std::unique_ptr<policy::DeviceLocalAccount>();
   const user_manager::User* const user =
       user_manager::UserManager::Get()->GetActiveUser();
@@ -691,9 +693,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,
+                                                  &current_app) &&
+         current_app.was_auto_launched_with_zero_delay) ||
+        chromeos::ArcKioskAppManager::Get()->
+            CurrentAppWasAutoLaunchedWithZeroDelay()) {
       return account;
     }
   }