summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorgwilson@google.com <gwilson@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2010-06-23 22:56:04 +0000
committergwilson@google.com <gwilson@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2010-06-23 22:56:04 +0000
commit218f45da1c19e775cf72f46cc72f1c624927fd93 (patch)
treec7a4457c9d95bc3ce9933ede5d4828b5d4b6598e
parent332e121630e7d3a69f1913f7f4583f8b8fc14367 (diff)
downloadchromium_src-218f45da1c19e775cf72f46cc72f1c624927fd93.zip
chromium_src-218f45da1c19e775cf72f46cc72f1c624927fd93.tar.gz
chromium_src-218f45da1c19e775cf72f46cc72f1c624927fd93.tar.bz2
Adds a placeholder preference for disabling any video/voice chat functionality, if it is ever added.
This placeholder is needed in the meantime so that some specific builds can have this preference pre-set before the feature(s) ever exist. R=cpu BUG=none TEST=none Review URL: http://codereview.chromium.org/2827020 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@50663 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/common/pref_names.cc4
-rw-r--r--chrome/common/pref_names.h2
2 files changed, 6 insertions, 0 deletions
diff --git a/chrome/common/pref_names.cc b/chrome/common/pref_names.cc
index c4d78d9..09cca77 100644
--- a/chrome/common/pref_names.cc
+++ b/chrome/common/pref_names.cc
@@ -779,6 +779,10 @@ const wchar_t kNumFoldersInOtherBookmarkFolder[] =
// Number of keywords.
const wchar_t kNumKeywords[] = L"user_experience_metrics.num_keywords";
+// Placeholder preference for disabling voice / video chat if it is ever added.
+// Currently, this does not change any behavior.
+const wchar_t kDisableVideoAndChat[] = L"disable_video_chat";
+
// Whether Extensions are enabled.
const wchar_t kDisableExtensions[] = L"extensions.disabled";
diff --git a/chrome/common/pref_names.h b/chrome/common/pref_names.h
index ca9ff0a..61763e0 100644
--- a/chrome/common/pref_names.h
+++ b/chrome/common/pref_names.h
@@ -283,6 +283,8 @@ extern const wchar_t kNumFoldersInOtherBookmarkFolder[];
extern const wchar_t kNumKeywords[];
+extern const wchar_t kDisableVideoAndChat[];
+
extern const wchar_t kDisableExtensions[];
extern const wchar_t kShowExtensionShelf[];
extern const wchar_t kBrowserActionContainerWidth[];