| Index: chrome/common/chrome_content_client.cc
|
| ===================================================================
|
| --- chrome/common/chrome_content_client.cc (revision 98713)
|
| +++ chrome/common/chrome_content_client.cc (working copy)
|
| @@ -22,6 +22,7 @@
|
| #include "ui/base/l10n/l10n_util.h"
|
| #include "ui/base/resource/resource_bundle.h"
|
| #include "webkit/glue/user_agent.h"
|
| +#include "webkit/plugins/plugin_constants.h"
|
|
|
| #if defined(OS_WIN)
|
| #include "content/common/sandbox_policy.h"
|
| @@ -33,43 +34,12 @@
|
| #endif
|
|
|
| namespace {
|
| -
|
| -const char* kPDFPluginName = "Chrome PDF Viewer";
|
| -const char* kPDFPluginMimeType = "application/pdf";
|
| -const char* kPDFPluginExtension = "pdf";
|
| -const char* kPDFPluginDescription = "Portable Document Format";
|
| -const char* kPDFPluginPrintPreviewMimeType
|
| - = "application/x-google-chrome-print-preview-pdf";
|
| -
|
| -const char* kNaClPluginName = "Native Client";
|
| -const char* kNaClPluginMimeType = "application/x-nacl";
|
| -const char* kNaClPluginExtension = "nexe";
|
| -const char* kNaClPluginDescription = "Native Client Executable";
|
| -
|
| -const char* kNaClOldPluginName = "Chrome NaCl";
|
| -
|
| #if defined(ENABLE_REMOTING)
|
| -const char* kRemotingViewerPluginName = "Remoting Viewer";
|
| const FilePath::CharType kRemotingViewerPluginPath[] =
|
| FILE_PATH_LITERAL("internal-remoting-viewer");
|
| -// Use a consistent MIME-type regardless of branding.
|
| -const char* kRemotingViewerPluginMimeType =
|
| - "application/vnd.chromium.remoting-viewer";
|
| -// TODO(wez): Remove the old MIME-type once client code no longer needs it.
|
| -const char* kRemotingViewerPluginOldMimeType =
|
| - "pepper-application/x-chromoting";
|
| #endif
|
|
|
| -const char* kFlashPluginName = "Shockwave Flash";
|
| -const char* kFlashPluginSwfMimeType = "application/x-shockwave-flash";
|
| -const char* kFlashPluginSwfExtension = "swf";
|
| -const char* kFlashPluginSwfDescription = "Shockwave Flash";
|
| -const char* kFlashPluginSplMimeType = "application/futuresplash";
|
| -const char* kFlashPluginSplExtension = "spl";
|
| -const char* kFlashPluginSplDescription = "FutureSplash Player";
|
| -
|
| #if !defined(NACL_WIN64) // The code this needs isn't linked on Win64 builds.
|
| -
|
| // 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,
|
| // and some are extra shared libraries distributed with the browser (these are
|
|
|