diff options
| author | nsylvain@chromium.org <nsylvain@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-25 13:36:55 +0000 |
|---|---|---|
| committer | nsylvain@chromium.org <nsylvain@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-25 13:36:55 +0000 |
| commit | 2f66e8ce0f3ac83e5dbc80bfa52760bb1a903ced (patch) | |
| tree | 732e449f1e510c1eab2d7e8802db97c4d632324a /chrome/app/google_update_client.cc | |
| parent | 3d5efa1683dd0f865463159e0837bb4ee6a6ea34 (diff) | |
| download | chromium_src-2f66e8ce0f3ac83e5dbc80bfa52760bb1a903ced.zip chromium_src-2f66e8ce0f3ac83e5dbc80bfa52760bb1a903ced.tar.gz chromium_src-2f66e8ce0f3ac83e5dbc80bfa52760bb1a903ced.tar.bz2 | |
Change the breakpad initialization for Google Chrome to be
the same as Chromium. Chromium was delayed, while Google Chrome
was not, resulting in another LoadLibrary of chrome.dll.
Since we are not really getting crash reports of chrome crashing
during LoadLibrary, we don't mind initializing after.
BUG:4564
TEST:about:crash still report a crash in Google Chrome and Chromium.
Review URL: http://codereview.chromium.org/146030
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@19242 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/app/google_update_client.cc')
| -rw-r--r-- | chrome/app/google_update_client.cc | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/chrome/app/google_update_client.cc b/chrome/app/google_update_client.cc index bbe216f..1906004 100644 --- a/chrome/app/google_update_client.cc +++ b/chrome/app/google_update_client.cc @@ -37,10 +37,14 @@ GoogleUpdateClient::~GoogleUpdateClient() { delete[] version_; } -std::wstring GoogleUpdateClient::GetDLLPath() { +std::wstring GoogleUpdateClient::GetDLLFullPath() { return client_util::GetDLLPath(dll_, dll_path_); } +std::wstring GoogleUpdateClient::GetDLLPath() { + return dll_path_; +} + const wchar_t* GoogleUpdateClient::GetVersion() const { return version_; } @@ -51,7 +55,6 @@ bool GoogleUpdateClient::Launch(HINSTANCE instance, const char* entry_name, int* ret) { if (client_util::FileExists(dll_path_)) { - ::SetCurrentDirectory(dll_path_); // Setting the version on the environment block is a 'best effort' deal. // It enables Google Update running on a child to load the same DLL version. ::SetEnvironmentVariableW(google_update::kEnvProductVersionKey, version_); |