Commit 000236de authored by Roman Sorokin's avatar Roman Sorokin Committed by Commit Bot

Disable sync consent for non-Gaia users

Now it is displayed for Active Directory users even though sync does not
work for them.

BUG=chromium:814777
TEST=manual

Change-Id: I34ca96cc84f6a630947d9224b954522fface1af1
Reviewed-on: https://chromium-review.googlesource.com/970912
Commit-Queue: Alexander Alekseev <alemate@chromium.org>
Reviewed-by: default avatarAlexander Alekseev <alemate@chromium.org>
Cr-Commit-Position: refs/heads/master@{#544891}
parent 77faf633
...@@ -590,8 +590,9 @@ void WizardController::ShowSyncConsentScreen() { ...@@ -590,8 +590,9 @@ void WizardController::ShowSyncConsentScreen() {
#if defined(GOOGLE_CHROME_BUILD) #if defined(GOOGLE_CHROME_BUILD)
const user_manager::UserManager* user_manager = const user_manager::UserManager* user_manager =
user_manager::UserManager::Get(); user_manager::UserManager::Get();
// Skip for non-regular users. // Skip for non-regular users and for users without Gaia account.
if (user_manager->IsLoggedInAsPublicAccount() || if (!user_manager->IsLoggedInAsUserWithGaiaAccount() ||
user_manager->IsLoggedInAsPublicAccount() ||
(user_manager->IsCurrentUserNonCryptohomeDataEphemeral() && (user_manager->IsCurrentUserNonCryptohomeDataEphemeral() &&
user_manager->GetActiveUser()->GetType() != user_manager->GetActiveUser()->GetType() !=
user_manager::USER_TYPE_REGULAR)) { user_manager::USER_TYPE_REGULAR)) {
......
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