summaryrefslogtreecommitdiffstats
path: root/chrome/common/pref_names.h
diff options
context:
space:
mode:
authorBen Murdoch <benm@google.com>2011-01-16 15:17:15 +0000
committerBen Murdoch <benm@google.com>2011-01-16 15:18:37 +0000
commitac1e49eb6695f711d72215fcdf9388548942a00d (patch)
tree88c78e7d66603996cf0dc78d7676b11d57a305bd /chrome/common/pref_names.h
parentdac52a1b6f0c401bccca1e5713f782a8b26345b3 (diff)
downloadexternal_chromium-ac1e49eb6695f711d72215fcdf9388548942a00d.zip
external_chromium-ac1e49eb6695f711d72215fcdf9388548942a00d.tar.gz
external_chromium-ac1e49eb6695f711d72215fcdf9388548942a00d.tar.bz2
Merge Chromium at 9.0.597.69: Trivial merge by Git.
/branches/597/src@71538 Change-Id: Id9fad65a5e6d2ab901d9c8bff6dbf96ab7977f36
Diffstat (limited to 'chrome/common/pref_names.h')
-rw-r--r--chrome/common/pref_names.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/chrome/common/pref_names.h b/chrome/common/pref_names.h
index 621cbe3..fae79ec 100644
--- a/chrome/common/pref_names.h
+++ b/chrome/common/pref_names.h
@@ -430,6 +430,8 @@ extern const char kGSSAPILibraryName[];
extern const char kKnownBackgroundPages[];
+extern const char kDisable3DAPIs[];
+
} // namespace prefs
#endif // CHROME_COMMON_PREF_NAMES_H_