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

Unified 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome_frame/chrome_frame_launcher.gyp ('k') | chrome_frame/chrome_launcher_utils.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome_frame/chrome_launcher_main.cc
===================================================================
--- chrome_frame/chrome_launcher_main.cc (revision 72310)
+++ chrome_frame/chrome_launcher_main.cc (working copy)
@@ -2,25 +2,29 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-
#include <windows.h>
#include <DbgHelp.h>
#include <string>
#include "chrome_frame/chrome_launcher.h"
#include "chrome_frame/crash_server_init.h"
+#include "chrome_frame/update_launcher.h"
-
int APIENTRY wWinMain(HINSTANCE, HINSTANCE, wchar_t*, int) {
const wchar_t* cmd_line = ::GetCommandLine();
google_breakpad::scoped_ptr<google_breakpad::ExceptionHandler> breakpad(
InitializeCrashReporting(cmd_line));
+ std::wstring update_command(
+ update_launcher::GetUpdateCommandFromArguments(cmd_line));
+
UINT exit_code = ERROR_FILE_NOT_FOUND;
- if (chrome_launcher::SanitizeAndLaunchChrome(::GetCommandLine())) {
+
+ if (!update_command.empty())
+ exit_code = update_launcher::LaunchUpdateCommand(update_command);
+ else if (chrome_launcher::SanitizeAndLaunchChrome(cmd_line))
exit_code = ERROR_SUCCESS;
- }
return exit_code;
}
« no previous file with comments | « chrome_frame/chrome_frame_launcher.gyp ('k') | chrome_frame/chrome_launcher_utils.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698