diff options
| author | achuith@chromium.org <achuith@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-21 19:21:49 +0000 |
|---|---|---|
| committer | achuith@chromium.org <achuith@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-21 19:21:49 +0000 |
| commit | 3cbae79b076f6cff6fcacbae93e87f5872a11c58 (patch) | |
| tree | ce03cf4a293e7bb31f1fa93cf3176f0f4ada9cef /chrome/browser/prefs | |
| parent | 13f3f595723af07d2de2fb184157fffaefa5a438 (diff) | |
| download | chromium_src-3cbae79b076f6cff6fcacbae93e87f5872a11c58.zip chromium_src-3cbae79b076f6cff6fcacbae93e87f5872a11c58.tar.gz chromium_src-3cbae79b076f6cff6fcacbae93e87f5872a11c58.tar.bz2 | |
Add gdata-related enterprise policy preferences.
* Add preferences kDisableGData, kDisableGDataOverCellular, kDisableGDataHostedFiles, and register/handle these.
* CommandLinePrefStore is used to set kDisableGData preference based on switch.
* Add GDataDisabled and GDataDisabledOverCellular to policy template, add to simple pref-policy handler list.
* Cros specific tests for new gdata policies.
BUG=chromium-os:27168
TEST=--disable-gdata works as expected. GDataDisabled in /etc/chromium/policies/managed/test_policy.json works as expected.
Review URL: https://chromiumcodereview.appspot.com/9719008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@128025 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/prefs')
| -rw-r--r-- | chrome/browser/prefs/command_line_pref_store.cc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/chrome/browser/prefs/command_line_pref_store.cc b/chrome/browser/prefs/command_line_pref_store.cc index 6200b52..ba83704 100644 --- a/chrome/browser/prefs/command_line_pref_store.cc +++ b/chrome/browser/prefs/command_line_pref_store.cc @@ -59,6 +59,9 @@ const CommandLinePrefStore::BooleanSwitchToPreferenceMapEntry #else { switches::kEnablePrintPreview, prefs::kPrintPreviewDisabled, false }, #endif +#if defined(OS_CHROMEOS) + { switches::kDisableGData, prefs::kDisableGData, true }, +#endif }; const CommandLinePrefStore::IntegerSwitchToPreferenceMapEntry |