diff options
| author | tschmelcher@chromium.org <tschmelcher@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-22 21:12:16 +0000 |
|---|---|---|
| committer | tschmelcher@chromium.org <tschmelcher@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-22 21:12:16 +0000 |
| commit | 73661f60b5e1eb10c6889f2ba0692166bcf83269 (patch) | |
| tree | cff5d8f417b11253882865e516b7365fee2a75e3 /o3d/plugin/cross | |
| parent | f0f100d293b93a8f09ff9dc7c71561116628885c (diff) | |
| download | chromium_src-73661f60b5e1eb10c6889f2ba0692166bcf83269.zip chromium_src-73661f60b5e1eb10c6889f2ba0692166bcf83269.tar.gz chromium_src-73661f60b5e1eb10c6889f2ba0692166bcf83269.tar.bz2 | |
Make ActiveX CLSIDs and names into overridable variables too. Also make the NPAPI plugin's filename overridable, since that's needed too in order to fully re-brand the NPAPI plugin.
TEST=built on Windows with branding overrides and verified that the product worked in both FF 3.6 and IE7 with similarly modified JavaScript code
BUG=none
Review URL: http://codereview.chromium.org/646071
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@39630 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'o3d/plugin/cross')
| -rw-r--r-- | o3d/plugin/cross/main.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/o3d/plugin/cross/main.cc b/o3d/plugin/cross/main.cc index d71e103..fe49c7c 100644 --- a/o3d/plugin/cross/main.cc +++ b/o3d/plugin/cross/main.cc @@ -170,7 +170,7 @@ NPError EXPORT_SYMBOL OSCALL NP_GetEntryPoints(NPPluginFuncs *pluginFuncs) { } char* NP_GetMIMEDescription(void) { - return const_cast<char*>(O3D_PLUGIN_MIME_TYPE "::O3D MIME"); + return const_cast<char*>(O3D_PLUGIN_NPAPI_MIMETYPE "::O3D MIME"); } } // namespace o3d / extern "C" |