Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(739)

Unified Diff: chrome/browser/chromeos/policy/user_cloud_policy_manager_chromeos.cc

Issue 2275963004: Apply default policy values also on non-ChromeOS
Patch Set: update tests Created 4 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/chromeos/policy/user_cloud_policy_manager_chromeos.cc
diff --git a/chrome/browser/chromeos/policy/user_cloud_policy_manager_chromeos.cc b/chrome/browser/chromeos/policy/user_cloud_policy_manager_chromeos.cc
index ef1cad39db0c3f07e959b21ca80e09752726f1fd..da25bdaf9ce87e0524e3d8573177bc43e5bdbc98 100644
--- a/chrome/browser/chromeos/policy/user_cloud_policy_manager_chromeos.cc
+++ b/chrome/browser/chromeos/policy/user_cloud_policy_manager_chromeos.cc
@@ -32,7 +32,6 @@
#include "components/policy/core/common/policy_map.h"
#include "components/policy/core/common/policy_pref_names.h"
#include "components/policy/core/common/policy_types.h"
-#include "components/policy/policy_constants.h"
#include "components/user_manager/user.h"
#include "components/user_manager/user_manager.h"
#include "net/url_request/url_request_context_getter.h"
@@ -312,17 +311,6 @@ void UserCloudPolicyManagerChromeOS::OnStoreLoaded(
}
}
-void UserCloudPolicyManagerChromeOS::GetChromePolicy(PolicyMap* policy_map) {
- CloudPolicyManager::GetChromePolicy(policy_map);
-
- // If the store has a verified policy blob received from the server then apply
- // the defaults for policies that haven't been configured by the administrator
- // given that this is an enterprise user.
- if (!store()->has_policy())
- return;
- SetEnterpriseUsersDefaults(policy_map);
-}
-
void UserCloudPolicyManagerChromeOS::FetchPolicyOAuthToken() {
const std::string& refresh_token = chromeos::UserSessionManager::GetInstance()
->user_context()

Powered by Google App Engine
This is Rietveld 408576698