Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(494)

Side by Side Diff: chrome_frame/chrome_launcher_main.cc

Issue 7219007: Fix up crash reporting in unit tests and the Chrome Frame helper processes: (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 9 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2009 The Chromium Authors. All rights reserved.
grt (UTC plus 2) 2011/06/22 14:15:01 2011 :-)
robertshield 2011/06/23 02:22:51 Done.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include <windows.h> 5 #include <windows.h>
6 #include <DbgHelp.h> 6 #include <DbgHelp.h>
7 #include <string> 7 #include <string>
8 8
9 #include "chrome_frame/chrome_launcher.h" 9 #include "chrome_frame/chrome_launcher.h"
10 #include "chrome_frame/crash_server_init.h" 10 #include "chrome_frame/crash_server_init.h"
11 #include "chrome_frame/update_launcher.h" 11 #include "chrome_frame/update_launcher.h"
12 12
13 int APIENTRY wWinMain(HINSTANCE, HINSTANCE, wchar_t*, int) { 13 int APIENTRY wWinMain(HINSTANCE, HINSTANCE, wchar_t*, int) {
14 google_breakpad::scoped_ptr<google_breakpad::ExceptionHandler> breakpad(
15 InitializeCrashReporting(NORMAL));
16
14 const wchar_t* cmd_line = ::GetCommandLine(); 17 const wchar_t* cmd_line = ::GetCommandLine();
15
16 google_breakpad::scoped_ptr<google_breakpad::ExceptionHandler> breakpad(
17 InitializeCrashReporting(cmd_line));
18
19 std::wstring update_command( 18 std::wstring update_command(
20 update_launcher::GetUpdateCommandFromArguments(cmd_line)); 19 update_launcher::GetUpdateCommandFromArguments(cmd_line));
21 20
22 UINT exit_code = ERROR_FILE_NOT_FOUND; 21 UINT exit_code = ERROR_FILE_NOT_FOUND;
23 22
24 if (!update_command.empty()) 23 if (!update_command.empty())
25 exit_code = update_launcher::LaunchUpdateCommand(update_command); 24 exit_code = update_launcher::LaunchUpdateCommand(update_command);
26 else if (chrome_launcher::SanitizeAndLaunchChrome(cmd_line)) 25 else if (chrome_launcher::SanitizeAndLaunchChrome(cmd_line))
27 exit_code = ERROR_SUCCESS; 26 exit_code = ERROR_SUCCESS;
28 27
29 return exit_code; 28 return exit_code;
30 } 29 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698