Add sessionType and playStoreStatus to chromeosInfoPrivate.

chrome/browser/chromeos/extensions/info_private_api.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/extensions/info_private_api.h"
 
 #include <stddef.h>
 
 #include <utility>
 
+#include "base/command_line.h"
 #include "base/sys_info.h"
 #include "base/values.h"
 #include "chrome/browser/app_mode/app_mode_utils.h"
 #include "chrome/browser/browser_process.h"
+#include "chrome/browser/chromeos/arc/arc_auth_service.h"
 #include "chrome/browser/chromeos/login/startup_utils.h"
 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h"
 #include "chrome/browser/chromeos/settings/cros_settings.h"
 #include "chrome/browser/chromeos/system/timezone_util.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/pref_names.h"
 #include "chromeos/network/device_state.h"
 #include "chromeos/network/network_handler.h"
 #include "chromeos/network/network_state_handler.h"
 #include "chromeos/settings/cros_settings_names.h"
 #include "chromeos/system/statistics_provider.h"
+#include "components/arc/arc_bridge_service.h"
 #include "components/metrics/metrics_service.h"
 #include "components/prefs/pref_service.h"
 #include "components/user_manager/user_manager.h"
+#include "extensions/browser/extensions_browser_client.h"
 #include "extensions/common/error_utils.h"
 #include "third_party/cros_system_api/dbus/service_constants.h"
 
 using chromeos::NetworkHandler;
 
 namespace extensions {
 
 namespace {
 
 // Key which corresponds to the HWID setting.
@@ skipping 58 matching lines @@
 
 // Key which corresponds to the switch access A11Y property in JS.
 const char kPropertySwitchAccessEnabled[] = "a11ySwitchAccessEnabled";
 
 // Key which corresponds to the send-function-keys property in JS.
 const char kPropertySendFunctionsKeys[] = "sendFunctionKeys";
 
 // Property not found error message.
 const char kPropertyNotFound[] = "Property '*' does not exist.";
 
+// Key which corresponds to the sessionType property in JS.
+const char kPropertySessionType[] = "sessionType";
+
+// Key which corresponds to the "kiosk" value of the SessionType enum in JS.
+const char kSessionTypeKiosk[] = "kiosk";
+
+// Key which corresponds to the "public session" value of the SessionType enum
+// in JS.
+const char kSessionTypePublicSession[] = "public session";

[Devlin, 2016/09/06 23:04:53]

Why not use the generated conversion functions?

[Rahul Chaturvedi, 2016/09/06 23:19:35]

Which generated conversion functions?

[Devlin, 2016/09/07 16:12:28]

We generate conversions from enums to strings, e.g.
https://cs.chromium.org/chromium/src/out/Debug/gen/extensions/common/api/runt....
 This helps prevent typos in the string value.

[Rahul Chaturvedi, 2016/09/07 20:13:23]

I understand that - but where do I find the conversions for this API. AFAICT, we
don't actually generate a gen/extensions/common/api/info_private.[h|cc]

[Devlin, 2016/09/07 20:23:27]

/sigh...it looks like we aren't compiling this API (it's not included in the
schemas.gypi).  That, I suppose, also explains why we're hand-constructing the
return value.

Changing it to compile and use the generated conversions is probably out of
scope for this change.  Mind adding a TODO?

+
+// Key which corresponds to the "normal" value of the SessionType enum in JS.
+const char kSessionTypeNormal[] = "normal";
+
+// Key which corresponds to the playStoreStatus property in JS.
+const char kPropertyPlayStoreStatus[] = "playStoreStatus";
+
+// Key which corresponds to the "not available" value of the PlayStoreStatus
+// enum in JS.
+const char kPlayStoreStatusNotAvailable[] = "not available";
+
+// Key which corresponds to the "available" value of the PlayStoreStatus enum in
+// JS.
+const char kPlayStoreStatusAvailable[] = "available";
+
+// Key which corresponds to the "enabled" value of the PlayStoreStatus enum in
+// JS.
+const char kPlayStoreStatusEnabled[] = "enabled";
+
 const struct {
   const char* api_name;
   const char* preference_name;
 } kPreferencesMap[] = {
     {kPropertyLargeCursorEnabled, prefs::kAccessibilityLargeCursorEnabled},
     {kPropertyStickyKeysEnabled, prefs::kAccessibilityStickyKeysEnabled},
     {kPropertySpokenFeedbackEnabled,
      prefs::kAccessibilitySpokenFeedbackEnabled},
     {kPropertyHighContrastEnabled, prefs::kAccessibilityHighContrastEnabled},
     {kPropertyScreenMagnifierEnabled,
@@ skipping 85 matching lines @@
       home_provider_id = cellular_device->home_provider_id();
     return new base::StringValue(home_provider_id);
   } else if (property_name == kPropertyInitialLocale) {
     return new base::StringValue(
         chromeos::StartupUtils::GetInitialLocale());
   } else if (property_name == kPropertyBoard) {
     return new base::StringValue(base::SysInfo::GetLsbReleaseBoard());
   } else if (property_name == kPropertyOwner) {
     return new base::FundamentalValue(
         user_manager::UserManager::Get()->IsCurrentUserOwner());
+  } else if (property_name == kPropertySessionType) {
+    if (ExtensionsBrowserClient::Get()->IsRunningInForcedAppMode()) {
+      return new base::StringValue(kSessionTypeKiosk);
+    } else if (ExtensionsBrowserClient::Get()->IsLoggedInAsPublicAccount()) {

[Devlin, 2016/09/06 23:04:53]

no else after return.  Ideally, that'd go for this whole function.  If you don't
want to do that in this CL, that's fine, but please add a TODO and format these
correctly.

[Rahul Chaturvedi, 2016/09/06 23:19:35]

I was trying to stick to the style in the file. If we're going to change it
here, I would rather we change it everywhere.
Done.

+      return new base::StringValue(kSessionTypePublicSession);
+    } else {
+      return new base::StringValue(kSessionTypeNormal);
+    }
+  } else if (property_name == kPropertyPlayStoreStatus) {
+    if (arc::ArcAuthService::IsAllowedForProfile(
+            Profile::FromBrowserContext(context_))) {
+      return new base::StringValue(kPlayStoreStatusEnabled);
+    } else if (arc::ArcBridgeService::GetAvailable(
+                   base::CommandLine::ForCurrentProcess())) {
+      return new base::StringValue(kPlayStoreStatusAvailable);
+    } else {
+      return new base::StringValue(kPlayStoreStatusNotAvailable);
+    }
   } else if (property_name == kPropertyClientId) {
     return new base::StringValue(GetClientId());
   } else if (property_name == kPropertyTimezone) {
     return chromeos::CrosSettings::Get()->GetPref(
             chromeos::kSystemTimezone)->DeepCopy();
   } else if (property_name == kPropertySupportedTimezones) {
     std::unique_ptr<base::ListValue> values =
         chromeos::system::GetTimezoneList();
     return values.release();
   } else {
@@ skipping 34 matching lines @@
           param_value);
     } else {
       return RespondNow(Error(kPropertyNotFound, param_name));
     }
   }
 
   return RespondNow(NoArguments());
 }
 
 }  // namespace extensions