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/win | |
| 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/win')
| -rw-r--r-- | o3d/plugin/win/config.cc | 6 | ||||
| -rw-r--r-- | o3d/plugin/win/o3dPlugin.def_template (renamed from o3d/plugin/win/o3dPlugin.def) | 2 | ||||
| -rw-r--r-- | o3d/plugin/win/o3dPlugin.rc_template | 10 |
3 files changed, 10 insertions, 8 deletions
diff --git a/o3d/plugin/win/config.cc b/o3d/plugin/win/config.cc index ea36452..aa99482 100644 --- a/o3d/plugin/win/config.cc +++ b/o3d/plugin/win/config.cc @@ -104,7 +104,7 @@ bool OpenDriverBlacklistFile(std::ifstream *input_file) { TCHAR app_data_path[MAX_PATH]; HRESULT result = SHGetFolderPath( NULL, - CSIDL_APPDATA, + O3D_PLUGIN_INSTALLDIR_CSIDL, NULL, 0, app_data_path); @@ -113,7 +113,9 @@ bool OpenDriverBlacklistFile(std::ifstream *input_file) { return false; } - PathAppend(app_data_path, _T("Google\\O3D\\driver_blacklist.txt")); + PathAppend(app_data_path, + _T(O3D_PLUGIN_VENDOR_DIRECTORY) _T("\\") + _T(O3D_PLUGIN_PRODUCT_DIRECTORY) _T("\\driver_blacklist.txt")); if (!PathFileExists(app_data_path)) { return false; } diff --git a/o3d/plugin/win/o3dPlugin.def b/o3d/plugin/win/o3dPlugin.def_template index 9685d16..4e3600a 100644 --- a/o3d/plugin/win/o3dPlugin.def +++ b/o3d/plugin/win/o3dPlugin.def_template @@ -1,4 +1,4 @@ -LIBRARY npo3dautoplugin +LIBRARY @@@PluginNpapiFilename@@@ EXPORTS NP_GetEntryPoints @1 diff --git a/o3d/plugin/win/o3dPlugin.rc_template b/o3d/plugin/win/o3dPlugin.rc_template index 8085cf9..3fb0940 100644 --- a/o3d/plugin/win/o3dPlugin.rc_template +++ b/o3d/plugin/win/o3dPlugin.rc_template @@ -70,15 +70,15 @@ BEGIN BLOCK "040904e4" BEGIN // This value must not change format as it is used by javascript - // to find the plugin. See o3d/main.scons + // to find the plugin. VALUE "FileDescription", "@@@PluginDescription@@@" VALUE "FileVersion", "@@@ProductVersionCommas@@@" - VALUE "InternalName", "npo3dautoplugin" + VALUE "InternalName", "@@@PluginNpapiFilename@@@" VALUE "LegalCopyright", "Copyright (C) 2007" - VALUE "MIMEType", "@@@PluginMimeType@@@" - VALUE "OriginalFilename", "npo3dautoplugin.dll" + VALUE "MIMEType", "@@@PluginNpapiMimeType@@@" + VALUE "OriginalFilename", "@@@PluginNpapiFilename@@@.dll" // This value must not change as it is used by javascript - // to find the plugin. See o3d/main.scons + // to find the plugin. VALUE "ProductName", "@@@PluginName@@@" VALUE "ProductVersion", "@@@ProductVersionCommas@@@" END |