Commit 29f6bc65 authored by Yue Cen's avatar Yue Cen Committed by Commit Bot

Disable FAR for managed and child accounts

Bug: 865797, 889926
Change-Id: I61046742614c58c477036cf259348ce250bd889a
Reviewed-on: https://chromium-review.googlesource.com/c/1252843
Commit-Queue: Yue Cen <rsgingerrs@chromium.org>
Reviewed-by: default avatarWenzhao (Colin) Zang <wzang@chromium.org>
Reviewed-by: default avatarXiyuan Xia <xiyuan@chromium.org>
Cr-Commit-Position: refs/heads/master@{#595966}
parent 3e73bade
...@@ -84,6 +84,7 @@ ...@@ -84,6 +84,7 @@
#include "chrome/browser/chromeos/system/timezone_util.h" #include "chrome/browser/chromeos/system/timezone_util.h"
#include "chrome/browser/lifetime/application_lifetime.h" #include "chrome/browser/lifetime/application_lifetime.h"
#include "chrome/browser/metrics/metrics_reporting_state.h" #include "chrome/browser/metrics/metrics_reporting_state.h"
#include "chrome/browser/policy/profile_policy_connector_factory.h"
#include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile.h"
#include "chrome/browser/profiles/profile_manager.h" #include "chrome/browser/profiles/profile_manager.h"
#include "chrome/browser/ui/ash/tablet_mode_client.h" #include "chrome/browser/ui/ash/tablet_mode_client.h"
...@@ -275,9 +276,18 @@ bool NetworkAllowUpdate(const chromeos::NetworkState* network) { ...@@ -275,9 +276,18 @@ bool NetworkAllowUpdate(const chromeos::NetworkState* network) {
return true; return true;
} }
// Return true if the feature flag for recommend app screen is on. // Return false if the logged in user is a managed or child account. Otherwise,
// return true if the feature flag for recommend app screen is on.
bool ShouldShowRecommendAppsScreen() { bool ShouldShowRecommendAppsScreen() {
return base::FeatureList::IsEnabled(features::kOobeRecommendAppsScreen); const user_manager::UserManager* user_manager =
user_manager::UserManager::Get();
DCHECK(user_manager->IsUserLoggedIn());
bool is_managed_account =
policy::ProfilePolicyConnectorFactory::IsProfileManaged(
ProfileManager::GetActiveUserProfile());
bool is_child_account = user_manager->IsLoggedInAsChildUser();
return !is_managed_account && !is_child_account &&
base::FeatureList::IsEnabled(features::kOobeRecommendAppsScreen);
} }
chromeos::LoginDisplayHost* GetLoginDisplayHost() { chromeos::LoginDisplayHost* GetLoginDisplayHost() {
......
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