OLD | NEW |
---|---|
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 #include <windows.h> | 5 #include <windows.h> |
6 #include <tchar.h> | 6 #include <tchar.h> |
7 | 7 |
8 #include "base/at_exit.h" | 8 #include "base/at_exit.h" |
9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
10 #include "chrome/app/breakpad_win.h" | 10 #include "chrome/app/breakpad_win.h" |
11 #include "chrome/app/client_util.h" | 11 #include "chrome/app/client_util.h" |
12 #include "chrome/app/metro_driver_win.h" | 12 #include "chrome/app/metro_driver_win.h" |
13 #include "content/public/app/startup_helper_win.h" | 13 #include "content/public/app/startup_helper_win.h" |
14 #include "content/public/common/content_switches.h" | |
14 #include "content/public/common/result_codes.h" | 15 #include "content/public/common/result_codes.h" |
15 #include "sandbox/src/sandbox_factory.h" | 16 #include "sandbox/src/sandbox_factory.h" |
16 | 17 |
17 int RunChrome(HINSTANCE instance) { | 18 int RunChrome(HINSTANCE instance) { |
18 bool exit_now = true; | 19 bool exit_now = true; |
19 // We restarted because of a previous crash. Ask user if we should relaunch. | 20 // We restarted because of a previous crash. Ask user if we should relaunch. |
20 if (ShowRestartDialogIfCrashed(&exit_now)) { | 21 // WE explicitly don't do this if we're a GPU process. See crbug.com/132119. |
apatrick_chromium
2012/06/25 21:34:30
nit: WE->We
robertshield
2012/06/26 00:18:53
Done.
| |
22 const CommandLine& command_line = *CommandLine::ForCurrentProcess(); | |
23 std::string process_type = | |
24 command_line.GetSwitchValueASCII(switches::kProcessType); | |
cpu_(ooo_6.6-7.5)
2012/06/25 20:12:36
not opposed to the approach, but I wonder if it wo
robertshield
2012/06/26 00:18:53
Done.
| |
25 | |
26 if (process_type != switches::kGpuProcess && | |
27 ShowRestartDialogIfCrashed(&exit_now)) { | |
21 if (exit_now) | 28 if (exit_now) |
22 return content::RESULT_CODE_NORMAL_EXIT; | 29 return content::RESULT_CODE_NORMAL_EXIT; |
23 } | 30 } |
24 | 31 |
25 // Initialize the sandbox services. | 32 // Initialize the sandbox services. |
26 sandbox::SandboxInterfaceInfo sandbox_info = {0}; | 33 sandbox::SandboxInterfaceInfo sandbox_info = {0}; |
27 content::InitializeSandboxInfo(&sandbox_info); | 34 content::InitializeSandboxInfo(&sandbox_info); |
28 | 35 |
29 // Load and launch the chrome dll. *Everything* happens inside. | 36 // Load and launch the chrome dll. *Everything* happens inside. |
30 MainDllLoader* loader = MakeMainDllLoader(); | 37 MainDllLoader* loader = MakeMainDllLoader(); |
31 int rc = loader->Launch(instance, &sandbox_info); | 38 int rc = loader->Launch(instance, &sandbox_info); |
32 loader->RelaunchChromeBrowserWithNewCommandLineIfNeeded(); | 39 loader->RelaunchChromeBrowserWithNewCommandLineIfNeeded(); |
33 delete loader; | 40 delete loader; |
34 return rc; | 41 return rc; |
35 } | 42 } |
36 | 43 |
37 int APIENTRY wWinMain(HINSTANCE instance, HINSTANCE prev, wchar_t*, int) { | 44 int APIENTRY wWinMain(HINSTANCE instance, HINSTANCE prev, wchar_t*, int) { |
38 // Initialize the commandline singleton from the environment. | 45 // Initialize the commandline singleton from the environment. |
39 CommandLine::Init(0, NULL); | 46 CommandLine::Init(0, NULL); |
40 // The exit manager is in charge of calling the dtors of singletons. | 47 // The exit manager is in charge of calling the dtors of singletons. |
41 base::AtExitManager exit_manager; | 48 base::AtExitManager exit_manager; |
42 | 49 |
43 MetroDriver metro_driver; | 50 MetroDriver metro_driver; |
44 if (metro_driver.in_metro_mode()) | 51 if (metro_driver.in_metro_mode()) |
45 return metro_driver.RunInMetro(instance, &RunChrome); | 52 return metro_driver.RunInMetro(instance, &RunChrome); |
46 // Not in metro mode, proceed as normal. | 53 // Not in metro mode, proceed as normal. |
47 return RunChrome(instance); | 54 return RunChrome(instance); |
48 } | 55 } |
OLD | NEW |