summaryrefslogtreecommitdiffstats
path: root/chrome/common/chrome_content_client.h
diff options
context:
space:
mode:
authorelijahtaylor@google.com <elijahtaylor@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-08-26 01:22:49 +0000
committerelijahtaylor@google.com <elijahtaylor@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-08-26 01:22:49 +0000
commitaa6a39339c9811b115680c48c00f6cc955367869 (patch)
treec14413530e1b6aca5477628af93e0e304e5e0a2f /chrome/common/chrome_content_client.h
parent90cf854e3e36879a17dacc01c1b17e388da40b94 (diff)
downloadchromium_src-aa6a39339c9811b115680c48c00f6cc955367869.zip
chromium_src-aa6a39339c9811b115680c48c00f6cc955367869.tar.gz
chromium_src-aa6a39339c9811b115680c48c00f6cc955367869.tar.bz2
Add a preference to force enable the NaCl plugin as we transition to
on-by-default. This is a mirror change of http://codereview.chromium.org/7720021/ for trunk (some files have changed so it was necessary to check into the branch and trunk separately instead of merging) BUG=93984 TEST=manual Review URL: http://codereview.chromium.org/7693030 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@98371 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common/chrome_content_client.h')
-rw-r--r--chrome/common/chrome_content_client.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/chrome/common/chrome_content_client.h b/chrome/common/chrome_content_client.h
index 62e5e9b..e3be5cc 100644
--- a/chrome/common/chrome_content_client.h
+++ b/chrome/common/chrome_content_client.h
@@ -14,6 +14,7 @@ class ChromeContentClient : public content::ContentClient {
public:
static const char* kPDFPluginName;
static const char* kNaClPluginName;
+ static const char* kNaClOldPluginName;
virtual void SetActiveURL(const GURL& url);
virtual void SetGpuInfo(const GPUInfo& gpu_info);