Index: chrome/browser/chromeos/policy/device_local_account_policy_provider.cc |
diff --git a/chrome/browser/chromeos/policy/device_local_account_policy_provider.cc b/chrome/browser/chromeos/policy/device_local_account_policy_provider.cc |
index 8d92faec03efbf52f8937124d297b49eb09a6c3b..ca40ec6395be301d49a17859bd5a98cda41f179d 100644 |
--- a/chrome/browser/chromeos/policy/device_local_account_policy_provider.cc |
+++ b/chrome/browser/chromeos/policy/device_local_account_policy_provider.cc |
@@ -15,7 +15,6 @@ |
#include "components/policy/core/common/policy_bundle.h" |
#include "components/policy/core/common/policy_map.h" |
#include "components/policy/core/common/policy_namespace.h" |
-#include "components/policy/core/common/policy_types.h" |
#include "policy/policy_constants.h" |
namespace policy { |
@@ -60,7 +59,6 @@ |
key::kLidCloseAction, |
POLICY_LEVEL_MANDATORY, |
POLICY_SCOPE_MACHINE, |
- POLICY_SOURCE_ENTERPRISE_OVERRIDE, |
new base::FundamentalValue( |
chromeos::PowerPolicyController::ACTION_STOP_SESSION), |
NULL); |
@@ -70,7 +68,6 @@ |
key::kShelfAutoHideBehavior, |
POLICY_LEVEL_MANDATORY, |
POLICY_SCOPE_MACHINE, |
- POLICY_SOURCE_ENTERPRISE_OVERRIDE, |
new base::StringValue("Never"), |
NULL); |
// Force the |ShowLogoutButtonInTray| policy to |true|, ensuring that a big, |
@@ -79,7 +76,6 @@ |
key::kShowLogoutButtonInTray, |
POLICY_LEVEL_MANDATORY, |
POLICY_SCOPE_MACHINE, |
- POLICY_SOURCE_ENTERPRISE_OVERRIDE, |
new base::FundamentalValue(true), |
NULL); |
// Force the |FullscreenAllowed| policy to |false|, ensuring that the ash |
@@ -88,7 +84,6 @@ |
key::kFullscreenAllowed, |
POLICY_LEVEL_MANDATORY, |
POLICY_SCOPE_MACHINE, |
- POLICY_SOURCE_ENTERPRISE_OVERRIDE, |
new base::FundamentalValue(false), |
NULL); |
} |
@@ -175,12 +170,8 @@ |
it != chrome_policy_overrides_->end(); |
++it) { |
const PolicyMap::Entry& entry = it->second; |
- chrome_policy.Set(it->first, |
- entry.level, |
- entry.scope, |
- entry.source, |
- entry.value->DeepCopy(), |
- nullptr); |
+ chrome_policy.Set( |
+ it->first, entry.level, entry.scope, entry.value->DeepCopy(), NULL); |
} |
} |