Commit 26ffb643 authored by Tommy Nyquist's avatar Tommy Nyquist Committed by Commit Bot

[android] Add support for enabling inline update flow flag

The Google Play inline update feature previously needed to be enabled
manually or from a server side configuration, but this CL makes it
possible to do this directly from
chrome://flags/#enable-inline-update-flow

The forced update types (#force-update-menu-type) still overrides this
though, to be able to test the feature without using the real backend
after the feature is on by default.

BUG=922714

Change-Id: I9a4f0b826a267c8c01cabd8d57679a35278c1938
Reviewed-on: https://chromium-review.googlesource.com/c/1478450Reviewed-by: default avatarDavid Trainor <dtrainor@chromium.org>
Reviewed-by: default avatarAvi Drissman <avi@chromium.org>
Commit-Queue: Tommy Nyquist <nyquist@chromium.org>
Cr-Commit-Position: refs/heads/master@{#633854}
parent 4b516fbd
...@@ -2264,6 +2264,9 @@ const FeatureEntry kFeatureEntries[] = { ...@@ -2264,6 +2264,9 @@ const FeatureEntry kFeatureEntries[] = {
{"force-update-menu-type", flag_descriptions::kUpdateMenuTypeName, {"force-update-menu-type", flag_descriptions::kUpdateMenuTypeName,
flag_descriptions::kUpdateMenuTypeDescription, kOsAndroid, flag_descriptions::kUpdateMenuTypeDescription, kOsAndroid,
MULTI_VALUE_TYPE(kForceUpdateMenuTypeChoices)}, MULTI_VALUE_TYPE(kForceUpdateMenuTypeChoices)},
{"enable-inline-update-flow", flag_descriptions::kInlineUpdateFlowName,
flag_descriptions::kInlineUpdateFlowDescription, kOsAndroid,
FEATURE_VALUE_TYPE(chrome::android::kInlineUpdateFlow)},
{"update-menu-item-custom-summary", {"update-menu-item-custom-summary",
flag_descriptions::kUpdateMenuItemCustomSummaryName, flag_descriptions::kUpdateMenuItemCustomSummaryName,
flag_descriptions::kUpdateMenuItemCustomSummaryDescription, kOsAndroid, flag_descriptions::kUpdateMenuItemCustomSummaryDescription, kOsAndroid,
......
...@@ -1299,6 +1299,11 @@ ...@@ -1299,6 +1299,11 @@
// "owners": [ "your-team" ], // "owners": [ "your-team" ],
"expiry_milestone": 76 "expiry_milestone": 76
}, },
{
"name": "enable-inline-update-flow",
"owners": [ "nyquist", "dtrainor" ],
"expiry_milestone": 76
},
{ {
"name": "enable-input-ime-api", "name": "enable-input-ime-api",
// "owners": [ "your-team" ], // "owners": [ "your-team" ],
......
...@@ -2699,6 +2699,13 @@ const char kUpdateMenuTypeInlineUpdateDownloadCanceled[] = ...@@ -2699,6 +2699,13 @@ const char kUpdateMenuTypeInlineUpdateDownloadCanceled[] =
const char kUpdateMenuTypeInlineUpdateInstallFailed[] = const char kUpdateMenuTypeInlineUpdateInstallFailed[] =
"Inline Update Error: Install Failed"; "Inline Update Error: Install Failed";
const char kInlineUpdateFlowName[] = "Enable Google Play inline update flow";
const char kInlineUpdateFlowDescription[] =
"When this flag is set, instead of taking the user to the Google Play "
"Store when an update is available, the user is presented with an inline "
"flow where they do not have to leave Chrome until the update is ready "
"to install.";
const char kThirdPartyDoodlesName[] = const char kThirdPartyDoodlesName[] =
"Enable Doodles for third-party search engines"; "Enable Doodles for third-party search engines";
const char kThirdPartyDoodlesDescription[] = const char kThirdPartyDoodlesDescription[] =
......
...@@ -1588,6 +1588,9 @@ extern const char kUpdateMenuTypeInlineUpdateDownloadFailed[]; ...@@ -1588,6 +1588,9 @@ extern const char kUpdateMenuTypeInlineUpdateDownloadFailed[];
extern const char kUpdateMenuTypeInlineUpdateDownloadCanceled[]; extern const char kUpdateMenuTypeInlineUpdateDownloadCanceled[];
extern const char kUpdateMenuTypeInlineUpdateInstallFailed[]; extern const char kUpdateMenuTypeInlineUpdateInstallFailed[];
extern const char kInlineUpdateFlowName[];
extern const char kInlineUpdateFlowDescription[];
extern const char kThirdPartyDoodlesName[]; extern const char kThirdPartyDoodlesName[];
extern const char kThirdPartyDoodlesDescription[]; extern const char kThirdPartyDoodlesDescription[];
......
...@@ -31229,6 +31229,7 @@ from previous Chrome versions. ...@@ -31229,6 +31229,7 @@ from previous Chrome versions.
<int value="-1346722635" label="gesture-selection"/> <int value="-1346722635" label="gesture-selection"/>
<int value="-1344375439" label="ServiceWorkerPaymentApps:disabled"/> <int value="-1344375439" label="ServiceWorkerPaymentApps:disabled"/>
<int value="-1343259222" label="RegionalLocalesAsDisplayUI:disabled"/> <int value="-1343259222" label="RegionalLocalesAsDisplayUI:disabled"/>
<int value="-1342961844" label="InlineUpdateFlow:disabled"/>
<int value="-1342039126" label="AshNewSystemMenu:enabled"/> <int value="-1342039126" label="AshNewSystemMenu:enabled"/>
<int value="-1341092934" label="enable-accelerated-overflow-scroll"/> <int value="-1341092934" label="enable-accelerated-overflow-scroll"/>
<int value="-1340055960" label="enable-streamlined-hosted-apps"/> <int value="-1340055960" label="enable-streamlined-hosted-apps"/>
...@@ -31946,6 +31947,7 @@ from previous Chrome versions. ...@@ -31946,6 +31947,7 @@ from previous Chrome versions.
<int value="-102227288" label="PasswordExport:disabled"/> <int value="-102227288" label="PasswordExport:disabled"/>
<int value="-99781021" label="disable-roboto-font-ui"/> <int value="-99781021" label="disable-roboto-font-ui"/>
<int value="-97145978" label="DesktopPWAsStayInWindow:enabled"/> <int value="-97145978" label="DesktopPWAsStayInWindow:enabled"/>
<int value="-92116820" label="InlineUpdateFlow:enabled"/>
<int value="-89690053" label="MaterialDesignUserManager:enabled"/> <int value="-89690053" label="MaterialDesignUserManager:enabled"/>
<int value="-88822940" label="ssl-version-min"/> <int value="-88822940" label="ssl-version-min"/>
<int value="-88273414" label="ContentSuggestionsShowSummary:enabled"/> <int value="-88273414" label="ContentSuggestionsShowSummary:enabled"/>
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