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/breakpad | |
| 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/breakpad')
| -rw-r--r-- | o3d/breakpad/breakpad.gyp | 6 | ||||
| -rw-r--r-- | o3d/breakpad/win/exception_handler_win32.cc | 6 |
2 files changed, 10 insertions, 2 deletions
diff --git a/o3d/breakpad/breakpad.gyp b/o3d/breakpad/breakpad.gyp index 512501f..68e64ae 100644 --- a/o3d/breakpad/breakpad.gyp +++ b/o3d/breakpad/breakpad.gyp @@ -8,6 +8,7 @@ }, 'includes': [ '../build/common.gypi', + '../plugin/branding.gypi', ], 'target_defaults': { 'include_dirs': [ @@ -15,6 +16,11 @@ '../..', '../../breakpad/src', ], + 'defines': [ + 'O3D_PLUGIN_INSTALLDIR_CSIDL=<(plugin_installdir_csidl)', + 'O3D_PLUGIN_VENDOR_DIRECTORY="<(plugin_vendor_directory)"', + 'O3D_PLUGIN_PRODUCT_DIRECTORY="<(plugin_product_directory)"', + ], }, 'conditions': [ ['OS=="mac"', diff --git a/o3d/breakpad/win/exception_handler_win32.cc b/o3d/breakpad/win/exception_handler_win32.cc index 96851f0..70a2607 100644 --- a/o3d/breakpad/win/exception_handler_win32.cc +++ b/o3d/breakpad/win/exception_handler_win32.cc @@ -148,13 +148,15 @@ static bool MinidumpCallback(const wchar_t *minidump_folder, HRESULT result = SHGetFolderPath( NULL, - CSIDL_APPDATA, + O3D_PLUGIN_INSTALLDIR_CSIDL, NULL, 0, reporterPath); if (result == 0) { - PathAppend(reporterPath, _T("Google\\O3D\\reporter.exe")); + PathAppend(reporterPath, + _T(O3D_PLUGIN_VENDOR_DIRECTORY) _T("\\") + _T(O3D_PLUGIN_PRODUCT_DIRECTORY) _T("\\reporter.exe")); } if (PathFileExists(reporterPath)) { |