chrome/browser/policy/javascript_policy_handler.cc - Issue 1658793002: Update chrome for new prefs location.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: chrome/browser/policy/javascript_policy_handler.cc

Issue 1658793002: Update chrome for new prefs location. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 10 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 unified diff | Download patch

« no previous file with comments | « chrome/browser/policy/file_selection_dialogs_policy_handler_unittest.cc ('k') | chrome/browser/policy/managed_bookmarks_policy_handler.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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/prefs/pref_value_map.h"

8 #include "base/values.h"	7 #include "base/values.h"

9 #include "components/content_settings/core/common/content_settings.h"	8 #include "components/content_settings/core/common/content_settings.h"

10 #include "components/content_settings/core/common/pref_names.h"	9 #include "components/content_settings/core/common/pref_names.h"

11 #include "components/policy/core/browser/policy_error_map.h"	10 #include "components/policy/core/browser/policy_error_map.h"

12 #include "components/policy/core/common/policy_map.h"	11 #include "components/policy/core/common/policy_map.h"

	12 #include "components/prefs/pref_value_map.h"

13 #include "grit/components_strings.h"	13 #include "grit/components_strings.h"

14 #include "policy/policy_constants.h"	14 #include "policy/policy_constants.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,

(...skipping 42 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
65 !enabled) {	65 !enabled) {

66 setting = CONTENT_SETTING_BLOCK;	66 setting = CONTENT_SETTING_BLOCK;

67 }	67 }

68 }	68 }

69	69

70 if (setting != CONTENT_SETTING_DEFAULT)	70 if (setting != CONTENT_SETTING_DEFAULT)

71 prefs->SetInteger(prefs::kManagedDefaultJavaScriptSetting, setting);	71 prefs->SetInteger(prefs::kManagedDefaultJavaScriptSetting, setting);

72 }	72 }

73	73

74 } // namespace policy	74 } // namespace policy

OLD	NEW