diff options
| author | robertshield@chromium.org <robertshield@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-17 16:24:42 +0000 |
|---|---|---|
| committer | robertshield@chromium.org <robertshield@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-17 16:24:42 +0000 |
| commit | 1a474191be022e293b6f869c398bab5b30be6540 (patch) | |
| tree | 62dc288c966312545970dd9b1ea3b89625d2f8c4 /chrome_frame/chrome_frame.gyp | |
| parent | fc225087ecfd3cbb121cc4e9abc02df79191dd56 (diff) | |
| download | chromium_src-1a474191be022e293b6f869c398bab5b30be6540.zip chromium_src-1a474191be022e293b6f869c398bab5b30be6540.tar.gz chromium_src-1a474191be022e293b6f869c398bab5b30be6540.tar.bz2 | |
Perform breakpad shutdown when returning from the chrome launcher entry point. This is a to avoid the deadlock that occurs when shutting it down in DllMain in chrome_launcher.exe.
BUG=44212
TEST=chrome_launcher.exe stops hanging
Review URL: http://codereview.chromium.org/2094006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@47422 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame/chrome_frame.gyp')
| -rw-r--r-- | chrome_frame/chrome_frame.gyp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome_frame/chrome_frame.gyp b/chrome_frame/chrome_frame.gyp index 2f8f19f..c0a67de 100644 --- a/chrome_frame/chrome_frame.gyp +++ b/chrome_frame/chrome_frame.gyp @@ -498,8 +498,6 @@ 'chrome_frame_plugin.h', 'chrome_frame_npapi.cc', 'chrome_frame_npapi.h', - 'chrome_launcher.cc', - 'chrome_launcher.h', 'ff_30_privilege_check.cc', 'ff_privilege_check.h', 'html_utils.cc', @@ -643,6 +641,8 @@ 'chrome_frame_reporting.h', 'chrome_imported_resources.cc', 'chrome_imported_resources.h', + 'chrome_launcher.cc', + 'chrome_launcher.h', 'chrome_protocol.cc', 'chrome_protocol.h', 'chrome_protocol.rgs', |