summaryrefslogtreecommitdiffstats
path: root/chrome/common/policy_constants.h
diff options
context:
space:
mode:
authorBen Murdoch <benm@google.com>2010-11-18 18:32:45 +0000
committerBen Murdoch <benm@google.com>2010-11-18 18:38:07 +0000
commit513209b27ff55e2841eac0e4120199c23acce758 (patch)
treeaeba30bb08c5f47c57003544e378a377c297eee6 /chrome/common/policy_constants.h
parent164f7496de0fbee436b385a79ead9e3cb81a50c1 (diff)
downloadexternal_chromium-513209b27ff55e2841eac0e4120199c23acce758.zip
external_chromium-513209b27ff55e2841eac0e4120199c23acce758.tar.gz
external_chromium-513209b27ff55e2841eac0e4120199c23acce758.tar.bz2
Merge Chromium at r65505: Initial merge by git.
Change-Id: I31d8f1d8cd33caaf7f47ffa7350aef42d5fbdb45
Diffstat (limited to 'chrome/common/policy_constants.h')
-rw-r--r--chrome/common/policy_constants.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/chrome/common/policy_constants.h b/chrome/common/policy_constants.h
index cebf36b..1bff710 100644
--- a/chrome/common/policy_constants.h
+++ b/chrome/common/policy_constants.h
@@ -47,10 +47,13 @@ extern const char kApplicationLocaleValue[];
extern const char kSyncDisabled[];
extern const char kExtensionInstallAllowList[];
extern const char kExtensionInstallDenyList[];
+extern const char kExtensionInstallForceList[];
extern const char kShowHomeButton[];
extern const char kPrintingEnabled[];
extern const char kJavascriptEnabled[];
extern const char kSavingBrowserHistoryDisabled[];
+extern const char kDeveloperToolsDisabled[];
+extern const char kBlockThirdPartyCookies[];
// Chrome Frame specific policy constants
extern const char kChromeFrameRendererSettings[];