chrome/browser/policy/configuration_policy_pref_store.cc - Issue 7390027: Added group policies to enable/disable importing of data from other browsers.

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

Unified Diff: chrome/browser/policy/configuration_policy_pref_store.cc

Issue 7390027: Added group policies to enable/disable importing of data from other browsers. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk

Patch Set: Created 9 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 side-by-side diff with in-line comments

Download patch

« chrome/browser/first_run/first_run.cc ('K') | « chrome/browser/first_run/first_run.cc ('k') | chrome/browser/policy/configuration_policy_pref_store_unittest.cc » ('j') | chrome/browser/policy/managed_prefs_banner_base.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/policy/configuration_policy_pref_store.cc

diff --git a/chrome/browser/policy/configuration_policy_pref_store.cc b/chrome/browser/policy/configuration_policy_pref_store.cc

index 3e62c8d75e5cb30a203db77f1b8599043a253398..907f8bb66eb9d4760756434ce8493e7efc285521 100644

--- a/chrome/browser/policy/configuration_policy_pref_store.cc

+++ b/chrome/browser/policy/configuration_policy_pref_store.cc

@@ -274,6 +274,16 @@ const ConfigurationPolicyPrefKeeper::PolicyToPreferenceMapEntry

prefs::kEditBookmarksEnabled },

{ Value::TYPE_BOOLEAN, kPolicyAllowFileSelectionDialogs,

prefs::kAllowFileSelectionDialogs },

+ { Value::TYPE_BOOLEAN, kPolicyImportBookmarks,

+ prefs::kImportBookmarks},

+ { Value::TYPE_BOOLEAN, kPolicyImportHistory,

+ prefs::kImportHistory},

+ { Value::TYPE_BOOLEAN, kPolicyImportHomepage,

+ prefs::kImportHomepage},

+ { Value::TYPE_BOOLEAN, kPolicyImportSearchEngine,

+ prefs::kImportSearchEngine },

+ { Value::TYPE_BOOLEAN, kPolicyImportSavedPasswords,

+ prefs::kImportSavedPasswords },

#if defined(OS_CHROMEOS)

{ Value::TYPE_BOOLEAN, kPolicyChromeOsLockOnIdleSuspend,

@@ -1065,6 +1075,16 @@ ConfigurationPolicyPrefStore::GetChromePolicyDefinitionList() {

key::kAllowFileSelectionDialogs },

{ kPolicyDiskCacheDir, Value::TYPE_STRING,

key::kDiskCacheDir },

+ { kPolicyImportBookmarks, Value::TYPE_BOOLEAN,

+ key::kImportBookmarks },

+ { kPolicyImportHistory, Value::TYPE_BOOLEAN,

+ key::kImportHistory },

+ { kPolicyImportHomepage, Value::TYPE_BOOLEAN,

+ key::kImportHomepage },

+ { kPolicyImportSearchEngine, Value::TYPE_BOOLEAN,

+ key::kImportSearchEngine },

+ { kPolicyImportSavedPasswords, Value::TYPE_BOOLEAN,

+ key::kImportSavedPasswords },

#if defined(OS_CHROMEOS)

{ kPolicyChromeOsLockOnIdleSuspend, Value::TYPE_BOOLEAN,