summaryrefslogtreecommitdiffstats
path: root/chrome/common/pref_names.h
diff options
context:
space:
mode:
authordilmah@chromium.org <dilmah@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-28 14:25:46 +0000
committerdilmah@chromium.org <dilmah@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-28 14:25:46 +0000
commit20564b3c9de85ff469ef51240d26fa965dd45619 (patch)
tree7bb8661191285d57c0a7bf8803c4642e261ff635 /chrome/common/pref_names.h
parent224e75e4f3778203e4ab199bbd8bbf287e4af4f5 (diff)
downloadchromium_src-20564b3c9de85ff469ef51240d26fa965dd45619.zip
chromium_src-20564b3c9de85ff469ef51240d26fa965dd45619.tar.gz
chromium_src-20564b3c9de85ff469ef51240d26fa965dd45619.tar.bz2
Store settings that should be signed in temporary place before owner is assigned.
Make proxy settings work on welcome screen in chromium OS. BUG=http://crosbug.com/3062 TEST=Manual Review URL: http://codereview.chromium.org/3860001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@64241 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common/pref_names.h')
-rw-r--r--chrome/common/pref_names.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/chrome/common/pref_names.h b/chrome/common/pref_names.h
index 2a5d6c3..bdc2c77 100644
--- a/chrome/common/pref_names.h
+++ b/chrome/common/pref_names.h
@@ -394,6 +394,10 @@ extern const char kProxyServer[];
extern const char kProxyPacUrl[];
extern const char kProxyBypassList[];
+#if defined(OS_CHROMEOS)
+extern const char kSignedSettingsTempStorage[];
+#endif
+
extern const char kRegisteredBackgroundContents[];
} // namespace prefs