Commit 471107c0 authored by Rahul Chaturvedi's avatar Rahul Chaturvedi Committed by Commit Bot

Add account_type to Feedback reports.

Add a new PSD to Feedback reports specifying the account type of the primary
user logged in.

R=afakhry@chromium.org

Bug: 891113
Change-Id: I6b46d65b0fb32fec0ef651d89dd06afcc3c58b25
Reviewed-on: https://chromium-review.googlesource.com/c/1277990
Commit-Queue: Rahul Chaturvedi <rkc@chromium.org>
Reviewed-by: default avatarAhmed Fakhry <afakhry@chromium.org>
Cr-Commit-Position: refs/heads/master@{#600618}
parent 49294223
...@@ -35,6 +35,7 @@ ...@@ -35,6 +35,7 @@
#include "chrome/browser/metrics/chromeos_metrics_provider.h" #include "chrome/browser/metrics/chromeos_metrics_provider.h"
#include "chromeos/dbus/util/version_loader.h" #include "chromeos/dbus/util/version_loader.h"
#include "chromeos/system/statistics_provider.h" #include "chromeos/system/statistics_provider.h"
#include "components/user_manager/user_manager.h"
#include "content/public/common/service_manager_connection.h" #include "content/public/common/service_manager_connection.h"
#include "services/service_manager/public/cpp/connector.h" #include "services/service_manager/public/cpp/connector.h"
#endif #endif
...@@ -61,6 +62,7 @@ constexpr char kSettingsKey[] = "settings"; ...@@ -61,6 +62,7 @@ constexpr char kSettingsKey[] = "settings";
constexpr char kLocalStateSettingsResponseKey[] = "Local State: settings"; constexpr char kLocalStateSettingsResponseKey[] = "Local State: settings";
constexpr char kArcStatusKey[] = "CHROMEOS_ARC_STATUS"; constexpr char kArcStatusKey[] = "CHROMEOS_ARC_STATUS";
constexpr char kMonitorInfoKey[] = "monitor_info"; constexpr char kMonitorInfoKey[] = "monitor_info";
constexpr char kAccountTypeKey[] = "account_type";
#else #else
constexpr char kOsVersionTag[] = "OS VERSION"; constexpr char kOsVersionTag[] = "OS VERSION";
#endif #endif
...@@ -71,6 +73,40 @@ constexpr char kInstallerBrandCode[] = "installer_brand_code"; ...@@ -71,6 +73,40 @@ constexpr char kInstallerBrandCode[] = "installer_brand_code";
#endif #endif
#if defined(OS_CHROMEOS) #if defined(OS_CHROMEOS)
std::string GetPrimaryAccountTypeString() {
DCHECK(user_manager::UserManager::Get());
const user_manager::User* primary_user =
user_manager::UserManager::Get()->GetPrimaryUser();
// In case we're on the login screen, we won't have a logged in user.
if (!primary_user)
return "none";
switch (primary_user->GetType()) {
case user_manager::USER_TYPE_REGULAR:
return "regular";
case user_manager::USER_TYPE_GUEST:
return "guest";
case user_manager::USER_TYPE_PUBLIC_ACCOUNT:
return "public_account";
case user_manager::USER_TYPE_SUPERVISED:
return "supervised";
case user_manager::USER_TYPE_KIOSK_APP:
return "kiosk_app";
case user_manager::USER_TYPE_CHILD:
return "child";
case user_manager::USER_TYPE_ARC_KIOSK_APP:
return "arc_kiosk_app";
case user_manager::USER_TYPE_ACTIVE_DIRECTORY:
return "active_directory";
case user_manager::NUM_USER_TYPES:
NOTREACHED();
break;
}
return std::string();
}
std::string GetEnrollmentStatusString() { std::string GetEnrollmentStatusString() {
switch (ChromeOSMetricsProvider::GetEnrollmentStatus()) { switch (ChromeOSMetricsProvider::GetEnrollmentStatus()) {
case ChromeOSMetricsProvider::NON_MANAGED: case ChromeOSMetricsProvider::NON_MANAGED:
...@@ -202,6 +238,7 @@ void ChromeInternalLogSource::Fetch(SysLogsSourceCallback callback) { ...@@ -202,6 +238,7 @@ void ChromeInternalLogSource::Fetch(SysLogsSourceCallback callback) {
ProfileManager::GetLastUsedProfile()) ProfileManager::GetLastUsedProfile())
? "enabled" ? "enabled"
: "disabled"); : "disabled");
response->emplace(kAccountTypeKey, GetPrimaryAccountTypeString());
PopulateLocalStateSettings(response.get()); PopulateLocalStateSettings(response.get());
// Chain asynchronous fetchers: PopulateMonitorInfoAsync, PopulateEntriesAsync // Chain asynchronous fetchers: PopulateMonitorInfoAsync, PopulateEntriesAsync
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment