Merge add profile id to chrome://policy to M109

This is a merge request (cherry picked from commit 6f303e4) Bug: 1384158 Change-Id: I0380924e85f230491c0df40e32244c0026a488f0 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4030967 Commit-Queue: Hamda Mare <hmare@google.com> Reviewed-by: Demetrios Papadopoulos <dpapad@chromium.org> Reviewed-by: Mike Dougherty <michaeldo@chromium.org> Reviewed-by: Yann Dago <ydago@chromium.org> Cr-Original-Commit-Position: refs/heads/main@{#1072979} Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4041846 Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com> Cr-Commit-Position: refs/branch-heads/5414@{#179} Cr-Branched-From: 4417ee5-refs/heads/main@{#1070088}
chromium · Nov 22, 2022 · 40fa7ba · 40fa7ba
1 parent 565deda
commit 40fa7ba
Show file tree

Hide file tree

Showing 12 changed files with 34 additions and 0 deletions.
diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
@@ -1995,6 +1995,7 @@ static_library("browser") {
     "//chrome/browser/browsing_data:constants",
     "//chrome/browser/chrome_for_testing:buildflags",
     "//chrome/browser/devtools",
+    "//chrome/browser/enterprise/identifiers",
     "//chrome/browser/enterprise/platform_auth:features",
     "//chrome/browser/favicon",
     "//chrome/browser/feature_guide/notifications:public",

diff --git a/chrome/browser/policy/status_provider/status_provider_util.cc b/chrome/browser/policy/status_provider/status_provider_util.cc
@@ -5,6 +5,8 @@
 #include "chrome/browser/policy/status_provider/status_provider_util.h"
 
 #include "base/values.h"
+#include "chrome/browser/enterprise/identifiers/profile_id_service_factory.h"
+#include "components/enterprise/browser/identifiers/profile_id_service.h"
 #include "components/policy/core/browser/webui/policy_status_provider.h"
 #include "google_apis/gaia/gaia_auth_util.h"
 #if BUILDFLAG(IS_CHROMEOS_ASH)
@@ -56,6 +58,18 @@ void SetDomainInUserStatus(base::Value::Dict& user_status) {
     user_status.Set(policy::kDomainKey, gaia::ExtractDomainName(*username));
 }
 
+void SetProfileId(base::Value::Dict* dict, Profile* profile) {
+  CHECK(profile);
+  auto* profile_id_service =
+      enterprise::ProfileIdServiceFactory::GetForProfile(profile);
+  if (!profile_id_service)
+    return;
+
+  auto profile_id = profile_id_service->GetProfileId();
+  if (profile_id)
+    dict->Set("profileId", profile_id.value());
+}
+
 #if BUILDFLAG(IS_CHROMEOS_ASH)
 void GetOffHoursStatus(base::Value::Dict* dict) {
   policy::off_hours::DeviceOffHoursController* off_hours_controller =

diff --git a/chrome/browser/policy/status_provider/status_provider_util.h b/chrome/browser/policy/status_provider/status_provider_util.h
@@ -21,6 +21,10 @@ void GetUserAffiliationStatus(base::Value::Dict* dict, Profile* profile);
 // domain of username.
 void SetDomainInUserStatus(base::Value::Dict& user_status);
 
+// Adds a new entry to |dict| with the enterprise profile identifier of the
+// current |profile|.
+void SetProfileId(base::Value::Dict* dict, Profile* profile);
+
 #if BUILDFLAG(IS_CHROMEOS_ASH)
 void GetOffHoursStatus(base::Value::Dict* dict);
 

diff --git a/chrome/browser/policy/status_provider/user_cloud_policy_status_provider.cc b/chrome/browser/policy/status_provider/user_cloud_policy_status_provider.cc
@@ -27,5 +27,6 @@ base::Value::Dict UserCloudPolicyStatusProvider::GetStatus() {
   GetUserAffiliationStatus(&dict, profile_);
   dict.Set(policy::kPolicyDescriptionKey, kUserPolicyStatusDescription);
   SetDomainInUserStatus(dict);
+  SetProfileId(&dict, profile_);
   return dict;
 }
diff --git a/chrome/browser/policy/status_provider/user_cloud_policy_status_provider_chromeos.cc b/chrome/browser/policy/status_provider/user_cloud_policy_status_provider_chromeos.cc
@@ -29,5 +29,6 @@ base::Value::Dict UserCloudPolicyStatusProviderChromeOS::GetStatus() {
   GetUserManager(&dict, profile_);
   dict.Set(policy::kPolicyDescriptionKey, kUserPolicyStatusDescription);
   SetDomainInUserStatus(dict);
+  SetProfileId(&dict, profile_);
   return dict;
 }
diff --git a/chrome/browser/policy/status_provider/user_policy_status_provider_lacros.cc b/chrome/browser/policy/status_provider/user_policy_status_provider_lacros.cc
@@ -56,5 +56,6 @@ base::Value::Dict UserPolicyStatusProviderLacros::GetStatus() {
                policy::CloudPolicyValidatorBase::Status::VALIDATION_OK));
   dict.Set(policy::kPolicyDescriptionKey, kUserPolicyStatusDescription);
   SetDomainInUserStatus(dict);
+  SetProfileId(&dict, profile_);
   return dict;
 }
diff --git a/chrome/browser/ui/webui/policy/policy_ui.cc b/chrome/browser/ui/webui/policy/policy_ui.cc
@@ -51,6 +51,7 @@ content::WebUIDataSource* CreatePolicyUIHtmlSource() {
     {"labelIsOffHoursActive", IDS_POLICY_LABEL_IS_OFFHOURS_ACTIVE},
     {"labelPoliciesPush", IDS_POLICY_LABEL_PUSH_POLICIES},
     {"labelPrecedence", IDS_POLICY_LABEL_PRECEDENCE},
+    {"labelProfileId", IDS_POLICY_LABEL_PROFILE_ID},
     {"labelRefreshInterval", IDS_POLICY_LABEL_REFRESH_INTERVAL},
     {"labelStatus", IDS_POLICY_LABEL_STATUS},
     {"labelTimeSinceLastFetchAttempt",

diff --git a/components/policy/resources/webui/status_box.html b/components/policy/resources/webui/status_box.html
@@ -65,6 +65,10 @@
     <div class="label">$i18n{labelClientId}</div>
     <div class="client-id"></div>
   </div>
+  <div class="status-entry" hidden>
+    <div class="label">$i18n{labelProfileId}</div>
+    <div class="profile-id"></div>
+  </div>
   <div class="status-entry" hidden>
     <div class="label">$i18n{labelAssetId}</div>
     <div class="asset-id"></div>

diff --git a/components/policy/resources/webui/status_box.js b/components/policy/resources/webui/status_box.js
@@ -85,6 +85,8 @@ export class StatusBoxElement extends CustomElement {
       // Populate the user gaia id.
       this.setLabelAndShow_('.gaia-id', status.gaiaId || notSpecifiedString);
       this.setLabelAndShow_('.client-id', status.clientId);
+      this.setLabelAndShow_('.profile-id', status.profileId);
+
       if (status.isAffiliated != null) {
         this.setLabelAndShow_(
             '.is-affiliated',

diff --git a/components/policy_strings.grdp b/components/policy_strings.grdp
@@ -419,6 +419,9 @@ Additional details:
   <message name="IDS_POLICY_LABEL_CLIENT_ID" desc="Label for the client IDs in the policy status boxes.">
     Client ID:
   </message>
+  <message name="IDS_POLICY_LABEL_PROFILE_ID" desc="Label for the user profile ID in the user policy status box.">
+    Profile ID:
+  </message>
   <message name="IDS_POLICY_LABEL_ASSET_ID" desc="Label for the asset ID in the device policy status box.">
     Asset ID:
   </message>

diff --git a/components/policy_strings_grdp/IDS_POLICY_LABEL_PROFILE_ID.png.sha1 b/components/policy_strings_grdp/IDS_POLICY_LABEL_PROFILE_ID.png.sha1
@@ -0,0 +1 @@
+cfa02041b09a032541ccd7e49381226210671cd9
diff --git a/ios/chrome/browser/ui/webui/policy/policy_ui.mm b/ios/chrome/browser/ui/webui/policy/policy_ui.mm
@@ -55,6 +55,7 @@
       {"labelIsOffHoursActive", IDS_POLICY_LABEL_IS_OFFHOURS_ACTIVE},
       {"labelPoliciesPush", IDS_POLICY_LABEL_PUSH_POLICIES},
       {"labelPrecedence", IDS_POLICY_LABEL_PRECEDENCE},
+      {"labelProfileId", IDS_POLICY_LABEL_PROFILE_ID},
       {"labelRefreshInterval", IDS_POLICY_LABEL_REFRESH_INTERVAL},
       {"labelStatus", IDS_POLICY_LABEL_STATUS},
       {"labelTimeSinceLastFetchAttempt",