OLD | NEW |
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "chrome/browser/policy/javascript_policy_handler.h" | 5 #include "chrome/browser/policy/javascript_policy_handler.h" |
6 | 6 |
7 #include "base/values.h" | 7 #include "base/values.h" |
8 #include "components/content_settings/core/common/content_settings.h" | 8 #include "components/content_settings/core/common/content_settings.h" |
9 #include "components/content_settings/core/common/pref_names.h" | 9 #include "components/content_settings/core/common/pref_names.h" |
10 #include "components/policy/core/browser/policy_error_map.h" | 10 #include "components/policy/core/browser/policy_error_map.h" |
11 #include "components/policy/core/common/policy_map.h" | 11 #include "components/policy/core/common/policy_map.h" |
12 #include "components/policy/policy_constants.h" | 12 #include "components/policy/policy_constants.h" |
13 #include "components/prefs/pref_value_map.h" | 13 #include "components/prefs/pref_value_map.h" |
14 #include "components/strings/grit/components_strings.h" | 14 #include "components/strings/grit/components_strings.h" |
15 | 15 |
16 namespace policy { | 16 namespace policy { |
17 | 17 |
18 JavascriptPolicyHandler::JavascriptPolicyHandler() {} | 18 JavascriptPolicyHandler::JavascriptPolicyHandler() {} |
19 | 19 |
20 JavascriptPolicyHandler::~JavascriptPolicyHandler() {} | 20 JavascriptPolicyHandler::~JavascriptPolicyHandler() {} |
21 | 21 |
22 bool JavascriptPolicyHandler::CheckPolicySettings(const PolicyMap& policies, | 22 bool JavascriptPolicyHandler::CheckPolicySettings(const PolicyMap& policies, |
23 PolicyErrorMap* errors) { | 23 PolicyErrorMap* errors) { |
24 const base::Value* javascript_enabled = | 24 const base::Value* javascript_enabled = |
25 policies.GetValue(key::kJavascriptEnabled); | 25 policies.GetValue(key::kJavascriptEnabled); |
26 const base::Value* default_setting = | 26 const base::Value* default_setting = |
27 policies.GetValue(key::kDefaultJavaScriptSetting); | 27 policies.GetValue(key::kDefaultJavaScriptSetting); |
28 | 28 |
29 if (javascript_enabled && | 29 if (javascript_enabled && |
30 !javascript_enabled->IsType(base::Value::TYPE_BOOLEAN)) { | 30 !javascript_enabled->IsType(base::Value::Type::BOOLEAN)) { |
31 errors->AddError(key::kJavascriptEnabled, IDS_POLICY_TYPE_ERROR, | 31 errors->AddError(key::kJavascriptEnabled, IDS_POLICY_TYPE_ERROR, |
32 base::Value::GetTypeName(base::Value::TYPE_BOOLEAN)); | 32 base::Value::GetTypeName(base::Value::Type::BOOLEAN)); |
33 } | 33 } |
34 | 34 |
35 if (default_setting && !default_setting->IsType(base::Value::TYPE_INTEGER)) { | 35 if (default_setting && !default_setting->IsType(base::Value::Type::INTEGER)) { |
36 errors->AddError(key::kDefaultJavaScriptSetting, IDS_POLICY_TYPE_ERROR, | 36 errors->AddError(key::kDefaultJavaScriptSetting, IDS_POLICY_TYPE_ERROR, |
37 base::Value::GetTypeName(base::Value::TYPE_INTEGER)); | 37 base::Value::GetTypeName(base::Value::Type::INTEGER)); |
38 } | 38 } |
39 | 39 |
40 if (javascript_enabled && default_setting) { | 40 if (javascript_enabled && default_setting) { |
41 errors->AddError(key::kJavascriptEnabled, | 41 errors->AddError(key::kJavascriptEnabled, |
42 IDS_POLICY_OVERRIDDEN, | 42 IDS_POLICY_OVERRIDDEN, |
43 key::kDefaultJavaScriptSetting); | 43 key::kDefaultJavaScriptSetting); |
44 } | 44 } |
45 | 45 |
46 return true; | 46 return true; |
47 } | 47 } |
(...skipping 15 matching lines...) Expand all Loading... |
63 !enabled) { | 63 !enabled) { |
64 setting = CONTENT_SETTING_BLOCK; | 64 setting = CONTENT_SETTING_BLOCK; |
65 } | 65 } |
66 } | 66 } |
67 | 67 |
68 if (setting != CONTENT_SETTING_DEFAULT) | 68 if (setting != CONTENT_SETTING_DEFAULT) |
69 prefs->SetInteger(prefs::kManagedDefaultJavaScriptSetting, setting); | 69 prefs->SetInteger(prefs::kManagedDefaultJavaScriptSetting, setting); |
70 } | 70 } |
71 | 71 |
72 } // namespace policy | 72 } // namespace policy |
OLD | NEW |