summaryrefslogtreecommitdiffstats
path: root/chromeos
diff options
context:
space:
mode:
authorpbond <pbond@chromium.org>2015-08-18 01:57:39 -0700
committerCommit bot <commit-bot@chromium.org>2015-08-18 08:58:20 +0000
commitb1d23bcdd177a18e44593e02b37a7c08fef41261 (patch)
tree05138eb8912fb1e86b233306192fd9d3a3e01679 /chromeos
parent9bdf478aa239f1ca2285076fdc3d0a81e984d28f (diff)
downloadchromium_src-b1d23bcdd177a18e44593e02b37a7c08fef41261.zip
chromium_src-b1d23bcdd177a18e44593e02b37a7c08fef41261.tar.gz
chromium_src-b1d23bcdd177a18e44593e02b37a7c08fef41261.tar.bz2
Added policy to disable/enable a system log upload.
BUG=471888 Review URL: https://codereview.chromium.org/1280003004 Cr-Commit-Position: refs/heads/master@{#343861}
Diffstat (limited to 'chromeos')
-rw-r--r--chromeos/settings/cros_settings_names.cc3
-rw-r--r--chromeos/settings/cros_settings_names.h2
2 files changed, 5 insertions, 0 deletions
diff --git a/chromeos/settings/cros_settings_names.cc b/chromeos/settings/cros_settings_names.cc
index 4d717fe..18e6882 100644
--- a/chromeos/settings/cros_settings_names.cc
+++ b/chromeos/settings/cros_settings_names.cc
@@ -121,6 +121,9 @@ const char kHeartbeatEnabled[] = "cros.device_status.heartbeat_enabled";
// How frequently heartbeats are sent up, in milliseconds.
const char kHeartbeatFrequency[] = "cros.device_status.heartbeat_frequency";
+// Determines whether system logs should be sent to the management server.
+const char kLogUploadEnabled[] = "cros.device_status.log_upload_enabled";
+
// This policy should not appear in the protobuf ever but is used internally to
// signal that we are running in a "safe-mode" for policy recovery.
const char kPolicyMissingMitigationMode[] =
diff --git a/chromeos/settings/cros_settings_names.h b/chromeos/settings/cros_settings_names.h
index 00fa07d..7ede09f 100644
--- a/chromeos/settings/cros_settings_names.h
+++ b/chromeos/settings/cros_settings_names.h
@@ -64,6 +64,8 @@ CHROMEOS_EXPORT extern const char kReportUploadFrequency[];
CHROMEOS_EXPORT extern const char kHeartbeatEnabled[];
CHROMEOS_EXPORT extern const char kHeartbeatFrequency[];
+CHROMEOS_EXPORT extern const char kLogUploadEnabled[];
+
CHROMEOS_EXPORT extern const char kPolicyMissingMitigationMode[];
CHROMEOS_EXPORT extern const char kAllowRedeemChromeOsRegistrationOffers[];