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

Side by Side Diff: chrome_frame/chrome_launcher_main.cc

Issue 6355011: When changing Ready Mode state from within an IE process, use chrome_launcher... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 9 years, 11 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.
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
6 #include <windows.h> 5 #include <windows.h>
7 #include <DbgHelp.h> 6 #include <DbgHelp.h>
8 #include <string> 7 #include <string>
9 8
10 #include "chrome_frame/chrome_launcher.h" 9 #include "chrome_frame/chrome_launcher.h"
11 #include "chrome_frame/crash_server_init.h" 10 #include "chrome_frame/crash_server_init.h"
12 11 #include "chrome_frame/update_launcher.h"
13 12
14 int APIENTRY wWinMain(HINSTANCE, HINSTANCE, wchar_t*, int) { 13 int APIENTRY wWinMain(HINSTANCE, HINSTANCE, wchar_t*, int) {
15 const wchar_t* cmd_line = ::GetCommandLine(); 14 const wchar_t* cmd_line = ::GetCommandLine();
16 15
17 google_breakpad::scoped_ptr<google_breakpad::ExceptionHandler> breakpad( 16 google_breakpad::scoped_ptr<google_breakpad::ExceptionHandler> breakpad(
18 InitializeCrashReporting(cmd_line)); 17 InitializeCrashReporting(cmd_line));
19 18
19 std::wstring update_command =
20 update_launcher::GetUpdateCommandFromArguments(cmd_line);
robertshield 2011/01/24 15:08:42 Nit: prefer constructor syntax: std::wstring upda
erikwright (departed) 2011/01/24 17:17:14 Done.
21
20 UINT exit_code = ERROR_FILE_NOT_FOUND; 22 UINT exit_code = ERROR_FILE_NOT_FOUND;
21 if (chrome_launcher::SanitizeAndLaunchChrome(::GetCommandLine())) { 23
24 if (!update_command.empty())
25 exit_code = update_launcher::LaunchUpdateCommand(update_command);
26 else if (chrome_launcher::SanitizeAndLaunchChrome(cmd_line))
22 exit_code = ERROR_SUCCESS; 27 exit_code = ERROR_SUCCESS;
23 }
24 28
25 return exit_code; 29 return exit_code;
26 } 30 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698