Surface enabling ARC for child accounts in chrome://flags.
This does not enable the whole feature, which also requires being in a
server-side whitelist.
Bug: 836246
Change-Id: I6be61a5a18ba1e102d9dceaf801ecdf24931dd9d
Reviewed-on: https://chromium-review.googlesource.com/1088930
Reviewed-by: Yury Khmel <[email protected]>
Commit-Queue: Bruno Kim Medeiros Cesar <[email protected]>
Cr-Commit-Position: refs/heads/master@{#564967}
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
index ef9424d..71150cf 100644
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
@@ -2749,6 +2749,9 @@
FEATURE_VALUE_TYPE(features::kEHVInputOnImeMenu)},
#endif // OS_CHROMEOS
#if defined(OS_CHROMEOS)
+ {"arc-available-for-child", flag_descriptions::kArcAvailableForChildName,
+ flag_descriptions::kArcAvailableForChildDescription, kOsCrOS,
+ FEATURE_VALUE_TYPE(arc::kAvailableForChildAccountFeature)},
{"arc-boot-completed-broadcast", flag_descriptions::kArcBootCompleted,
flag_descriptions::kArcBootCompletedDescription, kOsCrOS,
FEATURE_VALUE_TYPE(arc::kBootCompletedBroadcastFeature)},
diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc
index e223cc6..26e253e 100644
--- a/chrome/browser/flag_descriptions.cc
+++ b/chrome/browser/flag_descriptions.cc
@@ -2690,6 +2690,10 @@
const char kAllowTouchpadThreeFingerClickDescription[] =
"Enables touchpad three-finger-click as middle button.";
+const char kArcAvailableForChildName[] = "Allow ARC for child accounts";
+const char kArcAvailableForChildDescription[] =
+ "Allow child accounts to start Android apps.";
+
const char kArcBootCompleted[] = "Load Android apps automatically";
const char kArcBootCompletedDescription[] =
"Allow Android apps to start automatically after signing in.";
diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h
index 948bea4..5dbbf85 100644
--- a/chrome/browser/flag_descriptions.h
+++ b/chrome/browser/flag_descriptions.h
@@ -1649,6 +1649,9 @@
extern const char kAllowTouchpadThreeFingerClickName[];
extern const char kAllowTouchpadThreeFingerClickDescription[];
+extern const char kArcAvailableForChildName[];
+extern const char kArcAvailableForChildDescription[];
+
extern const char kArcBootCompleted[];
extern const char kArcBootCompletedDescription[];
diff --git a/tools/metrics/histograms/enums.xml b/tools/metrics/histograms/enums.xml
index 1c0ed77..c6fa79d1 100644
--- a/tools/metrics/histograms/enums.xml
+++ b/tools/metrics/histograms/enums.xml
@@ -27749,6 +27749,7 @@
<int value="143725809" label="DownloadProgressInfoBar:enabled"/>
<int value="147342055" label="ChromeHomeClearUrlOnOpen:disabled"/>
<int value="147373243" label="enable-deferred-image-decoding"/>
+ <int value="151022756" label="ArcAvailableForChildAccount:disabled"/>
<int value="151101719" label="HtmlBaseUsernameDetector:enabled"/>
<int value="157217034" label="enable-tab-for-desktop-share"/>
<int value="157318016" label="AutomaticTabDiscarding:enabled"/>
@@ -28429,6 +28430,7 @@
<int value="1670161209" label="ClickToOpenPDFPlaceholder:enabled"/>
<int value="1670799163" label="ChromeHomeShowGoogleGWhenUrlCleared:enabled"/>
<int value="1673427566" label="ChromeHomeExpandButton:disabled"/>
+ <int value="1679558835" label="ArcAvailableForChildAccount:enabled"/>
<int value="1689123607" label="enable-app-link"/>
<int value="1689183477" label="enable-merge-key-char-events"/>
<int value="1690837904" label="save-previous-document-resources"/>