summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjohnme@google.com <johnme@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-02-03 21:49:24 +0000
committerjohnme@google.com <johnme@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-02-03 21:49:24 +0000
commitdc849cc62a3b3ad1b0cc246e88dc4d204a9774cc (patch)
treebd815b2cf6e6cfe83959df6eb20a117af1c699ea
parent2a28e0b2f08036c00598eadfd5bf6bb7fbe0d339 (diff)
downloadchromium_src-dc849cc62a3b3ad1b0cc246e88dc4d204a9774cc.zip
chromium_src-dc849cc62a3b3ad1b0cc246e88dc4d204a9774cc.tar.gz
chromium_src-dc849cc62a3b3ad1b0cc246e88dc4d204a9774cc.tar.bz2
ifdef out kRemotingPluginMimeType to fix Chromium Linux Redux build.
ifdef out kRemotingPluginMimeType introduced by commit 499e891bb2de3cd345064ef09a24991c3af984b8 (http://codereview.chromium.org/6246031) to fix Chromium Linux Redux fatal warning "chrome/common/pepper_plugin_registry.cc:30: error: <unnamed>::kRemotingPluginMimeType defined but not used". BUG=none TEST=none Review URL: http://codereview.chromium.org/6349073 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@73671 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/common/pepper_plugin_registry.cc2
1 files changed, 2 insertions, 0 deletions
diff --git a/chrome/common/pepper_plugin_registry.cc b/chrome/common/pepper_plugin_registry.cc
index 298fd22..8e967c4 100644
--- a/chrome/common/pepper_plugin_registry.cc
+++ b/chrome/common/pepper_plugin_registry.cc
@@ -27,7 +27,9 @@ const char* kNaClPluginMimeType = "application/x-nacl";
const char* kNaClPluginExtension = "nexe";
const char* kNaClPluginDescription = "Native Client Executable";
+#if defined(ENABLE_REMOTING)
const char* kRemotingPluginMimeType = "pepper-application/x-chromoting";
+#endif
// Appends the known built-in plugins to the given vector. Some built-in
// plugins are "internal" which means they are compiled into the Chrome binary,