Commit 334bd3d6 authored by Ramin Halavati's avatar Ramin Halavati Committed by Chromium LUCI CQ

Revert "Make two settings sections visible for ephemeral guest profiles"

This reverts commit f354c627.

Reason for revert: Ephemeral Guest profiles will have the same UI as old (off-the-record) Guest profiles in M89.

Original change's description:
> Make two settings sections visible for ephemeral guest profiles
>
> - Make the "You and Google" and "Auto-fill" sections visible,
> when settings is based on an ephemeral guest profile.
> - The notion of Ephemeral Guest profiles (go/ephemeral-guest-profiles)
> is to be replacing the current guest profiles.
>
> Bug: 1140419
> Change-Id: If10584bb4a8105275c2eac8c581c7abccf545225
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2483753
> Reviewed-by: dpapad <dpapad@chromium.org>
> Commit-Queue: Huanzhong Huang <huanzhong@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#819350}

TBR=dpapad@chromium.org,rhalavati@chromium.org,huanzhong@chromium.org

# Not skipping CQ checks because original CL landed > 1 day ago.

Bug: 1140419
Change-Id: I1ec303884ba5a5585225b50e5364197880917f14
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2582084Reviewed-by: default avatarRamin Halavati <rhalavati@chromium.org>
Reviewed-by: default avatardpapad <dpapad@chromium.org>
Commit-Queue: Ramin Halavati <rhalavati@chromium.org>
Cr-Commit-Position: refs/heads/master@{#835631}
parent 21027a57
......@@ -47,15 +47,12 @@ export let PrivacyPageVisibility;
export let pageVisibility;
if (loadTimeData.getBoolean('isGuest')) {
const isEphemeralGuestProfile =
loadTimeData.getBoolean('isEphemeralGuestProfile');
// "if not chromeos" and "if chromeos" in two completely separate blocks
// to work around closure compiler.
// <if expr="not chromeos">
pageVisibility = {
autofill: isEphemeralGuestProfile,
people: isEphemeralGuestProfile,
autofill: false,
people: false,
privacy: false,
onStartup: false,
reset: false,
......
......@@ -101,8 +101,7 @@ function createBrowserSettingsRoutes() {
r.SIGN_OUT.isNavigableDialog = true;
r.SEARCH = r.BASIC.createSection('/search', 'search');
if (!loadTimeData.getBoolean('isGuest') ||
loadTimeData.getBoolean('isEphemeralGuestProfile')) {
if (!loadTimeData.getBoolean('isGuest')) {
r.PEOPLE = r.BASIC.createSection('/people', 'people');
r.SYNC = r.PEOPLE.createChild('/syncSetup');
r.SYNC_ADVANCED = r.SYNC.createChild('/syncSetup/advanced');
......
......@@ -191,7 +191,7 @@ void AddCommonStrings(content::WebUIDataSource* html_source, Profile* profile) {
user_manager::UserManager::Get()->IsLoggedInAsGuest() ||
user_manager::UserManager::Get()->IsLoggedInAsPublicAccount());
#else
profile->IsGuestSession() || profile->IsEphemeralGuestProfile());
profile->IsOffTheRecord());
#endif
html_source->AddBoolean("isSupervised", profile->IsSupervised());
......
......@@ -283,9 +283,6 @@ SettingsUI::SettingsUI(content::WebUI* web_ui)
"enableContentSettingsRedesign",
base::FeatureList::IsEnabled(features::kContentSettingsRedesign));
html_source->AddBoolean("isEphemeralGuestProfile",
profile->IsEphemeralGuestProfile());
#if defined(OS_WIN)
html_source->AddBoolean(
"safetyCheckChromeCleanerChildEnabled",
......
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