chrome/browser/profiles/profile.cc - Issue 10694037: Add a policy to disable proceeding through the Safe Browsing interstitials.

Side by Side Diff: chrome/browser/profiles/profile.cc

Issue 10694037: Add a policy to disable proceeding through the Safe Browsing interstitials. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master

Patch Set: Rebased, addressed comments, fixed jstemplate root in multi_threat_block page, added new browser ac… Created 8 years, 5 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/configuration_policy_handler_list.cc ('k') | chrome/browser/resources/safe_browsing_malware_block.html » ('j') | chrome/browser/resources/safe_browsing_malware_block.html » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2012 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/profiles/profile.h"	5 #include "chrome/browser/profiles/profile.h"

6	6

7 #include <string>	7 #include <string>

8	8

9 #include "build/build_config.h"	9 #include "build/build_config.h"

10 #include "chrome/browser/prefs/pref_service.h"	10 #include "chrome/browser/prefs/pref_service.h"

(...skipping 42 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
53 PrefService::SYNCABLE_PREF);	53 PrefService::SYNCABLE_PREF);

54 prefs->RegisterBooleanPref(prefs::kSessionExitedCleanly,	54 prefs->RegisterBooleanPref(prefs::kSessionExitedCleanly,

55 true,	55 true,

56 PrefService::UNSYNCABLE_PREF);	56 PrefService::UNSYNCABLE_PREF);

57 prefs->RegisterBooleanPref(prefs::kSafeBrowsingEnabled,	57 prefs->RegisterBooleanPref(prefs::kSafeBrowsingEnabled,

58 true,	58 true,

59 PrefService::SYNCABLE_PREF);	59 PrefService::SYNCABLE_PREF);

60 prefs->RegisterBooleanPref(prefs::kSafeBrowsingReportingEnabled,	60 prefs->RegisterBooleanPref(prefs::kSafeBrowsingReportingEnabled,

61 false,	61 false,

62 PrefService::UNSYNCABLE_PREF);	62 PrefService::UNSYNCABLE_PREF);

	63 prefs->RegisterBooleanPref(prefs::kSafeBrowsingProceedAnywayDisabled,

	64 false,

	65 PrefService::UNSYNCABLE_PREF);

63 prefs->RegisterBooleanPref(prefs::kDisableExtensions,	66 prefs->RegisterBooleanPref(prefs::kDisableExtensions,

64 false,	67 false,

65 PrefService::UNSYNCABLE_PREF);	68 PrefService::UNSYNCABLE_PREF);

66 prefs->RegisterBooleanPref(prefs::kExtensionAlertsInitializedPref,	69 prefs->RegisterBooleanPref(prefs::kExtensionAlertsInitializedPref,

67 false, PrefService::UNSYNCABLE_PREF);	70 false, PrefService::UNSYNCABLE_PREF);

68 prefs->RegisterStringPref(prefs::kSelectFileLastDirectory,	71 prefs->RegisterStringPref(prefs::kSelectFileLastDirectory,

69 "",	72 "",

70 PrefService::UNSYNCABLE_PREF);	73 PrefService::UNSYNCABLE_PREF);

71 prefs->RegisterDoublePref(prefs::kDefaultZoomLevel,	74 prefs->RegisterDoublePref(prefs::kDefaultZoomLevel,

72 0.0,	75 0.0,

(...skipping 42 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
115 return is_guest_session;	118 return is_guest_session;

116 #else	119 #else

117 return false;	120 return false;

118 #endif	121 #endif

119 }	122 }

120	123

121 bool Profile::IsSyncAccessible() {	124 bool Profile::IsSyncAccessible() {

122 browser_sync::SyncPrefs prefs(GetPrefs());	125 browser_sync::SyncPrefs prefs(GetPrefs());

123 return ProfileSyncService::IsSyncEnabled() && !prefs.IsManaged();	126 return ProfileSyncService::IsSyncEnabled() && !prefs.IsManaged();

124 }	127 }

OLD	NEW