Enable screen capture for ARC++ Kiosk

chrome/browser/chromeos/policy/device_status_collector.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/chromeos/policy/device_status_collector.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <algorithm>
@@ skipping 13 matching lines @@
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/sys_info.h"
 #include "base/task_runner_util.h"
 #include "base/threading/sequenced_task_runner_handle.h"
 #include "base/threading/sequenced_worker_pool.h"
 #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"
 #include "chrome/browser/chromeos/policy/device_local_account.h"
 #include "chrome/browser/chromeos/policy/user_cloud_policy_manager_chromeos.h"
 #include "chrome/browser/chromeos/policy/user_policy_manager_factory_chromeos.h"
 #include "chrome/browser/chromeos/profiles/profile_helper.h"
 #include "chrome/browser/chromeos/settings/cros_settings.h"
 #include "chrome/browser/policy/profile_policy_connector.h"
 #include "chrome/browser/policy/profile_policy_connector_factory.h"
@@ skipping 10 matching lines @@
 #include "chromeos/settings/cros_settings_names.h"
 #include "chromeos/system/statistics_provider.h"
 #include "components/arc/arc_bridge_service.h"
 #include "components/arc/arc_service_manager.h"
 #include "components/arc/common/enterprise_reporting.mojom.h"
 #include "components/policy/core/common/cloud/cloud_policy_constants.h"
 #include "components/policy/proto/device_management_backend.pb.h"
 #include "components/prefs/pref_registry_simple.h"
 #include "components/prefs/pref_service.h"
 #include "components/prefs/scoped_user_pref_update.h"
+#include "components/signin/core/account_id/account_id.h"
 #include "components/user_manager/user.h"
 #include "components/user_manager/user_manager.h"
 #include "components/user_manager/user_type.h"
 #include "components/version_info/version_info.h"
 #include "content/public/browser/browser_thread.h"
 #include "extensions/browser/extension_registry.h"
 #include "extensions/common/extension.h"
 #include "storage/browser/fileapi/external_mount_points.h"
 #include "third_party/cros_system_api/dbus/service_constants.h"
 
@@ skipping 172 matching lines @@
   instance->GetStatus(receiver);
   return true;
 }
 
 // Returns the DeviceLocalAccount associated with the current kiosk session.
 // Returns null if there is no active kiosk session, or if that kiosk
 // session has been removed from policy since the session started, in which
 // 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/16 19:42:30]

nit: you cannot elide the brace here since the condition spans more than one
line.

[Ivan Šandrk, 2017/03/16 22:32:50]

Is there a rule about this in the style guide? I never saw it and didn't manage
to find it now. And I've actually seen other code written like this.

     return std::unique_ptr<policy::DeviceLocalAccount>();
   const user_manager::User* const user =
       user_manager::UserManager::Get()->GetActiveUser();
   const std::vector<policy::DeviceLocalAccount> accounts =
       policy::GetDeviceLocalAccounts(settings);
 
   for (const auto& device_local_account : accounts) {
     if (AccountId::FromUserEmail(device_local_account.user_id) ==
         user->GetAccountId()) {
       return base::MakeUnique<policy::DeviceLocalAccount>(device_local_account);
@@ skipping 417 matching lines @@
   }
   last_idle_check_ = now;
 }
 
 std::unique_ptr<DeviceLocalAccount>
 DeviceStatusCollector::GetAutoLaunchedKioskSessionInfo() {
   std::unique_ptr<DeviceLocalAccount> account =
       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) {
+    auto* arc_kiosk_app_manager = chromeos::ArcKioskAppManager::Get();
+    const chromeos::ArcKioskAppManager::ArcKioskApp* current_arc_app =
+        arc_kiosk_app_manager->GetAppByAccountId(
+            AccountId::FromUserEmail(account->user_id));
+    if ((chromeos::KioskAppManager::Get()->GetApp(account->kiosk_app_id,
+                                                  &current_app) &&
+         current_app.was_auto_launched_with_zero_delay) ||
+        (current_arc_app && current_arc_app->account_id() ==
+             arc_kiosk_app_manager->GetWasAutoLaunchedWithZeroDelay())) {
       return account;
     }
   }
   // No auto-launched kiosk session active.
   return std::unique_ptr<DeviceLocalAccount>();
 }
 
 void DeviceStatusCollector::SampleResourceUsage() {
   // Results must be written in the creation thread since that's where they
   // are read from in the Get*StatusAsync methods.
@@ skipping 544 matching lines @@
 
 void DeviceStatusCollector::OnOSVersion(const std::string& version) {
   os_version_ = version;
 }
 
 void DeviceStatusCollector::OnOSFirmware(const std::string& version) {
   firmware_version_ = version;
 }
 
 }  // namespace policy