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

Side by Side Diff: chrome/nacl/nacl_exe_win_64.cc

Issue 2491463002: Revert of Windows install_static refactor. (Closed)
Patch Set: Created 4 years, 1 month 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
« no previous file with comments | « chrome/nacl/DEPS ('k') | chrome/test/base/chrome_test_launcher.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 "base/at_exit.h" 5 #include "base/at_exit.h"
6 #include "base/command_line.h" 6 #include "base/command_line.h"
7 #include "base/lazy_instance.h" 7 #include "base/lazy_instance.h"
8 #include "build/build_config.h"
9 #include "chrome/app/chrome_crash_reporter_client_win.h" 8 #include "chrome/app/chrome_crash_reporter_client_win.h"
10 #include "chrome/install_static/product_install_details.h"
11 #include "components/crash/content/app/breakpad_win.h" 9 #include "components/crash/content/app/breakpad_win.h"
12 #include "components/nacl/loader/nacl_helper_win_64.h" 10 #include "components/nacl/loader/nacl_helper_win_64.h"
13 #include "content/public/common/content_switches.h" 11 #include "content/public/common/content_switches.h"
14 12
15 namespace { 13 namespace {
16 14
17 base::LazyInstance<ChromeCrashReporterClient>::Leaky g_chrome_crash_client = 15 base::LazyInstance<ChromeCrashReporterClient>::Leaky g_chrome_crash_client =
18 LAZY_INSTANCE_INITIALIZER; 16 LAZY_INSTANCE_INITIALIZER;
19 17
20 } // namespace 18 } // namespace
21 19
22 int APIENTRY wWinMain(HINSTANCE instance, HINSTANCE, wchar_t*, int) { 20 int APIENTRY wWinMain(HINSTANCE instance, HINSTANCE, wchar_t*, int) {
23 #if defined(OS_WIN)
24 install_static::InitializeProductDetailsForPrimaryModule();
25 #endif
26
27 base::AtExitManager exit_manager; 21 base::AtExitManager exit_manager;
28 base::CommandLine::Init(0, NULL); 22 base::CommandLine::Init(0, NULL);
29 23
30 std::string process_type = 24 std::string process_type =
31 base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII( 25 base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
32 switches::kProcessType); 26 switches::kProcessType);
33 crash_reporter::SetCrashReporterClient(g_chrome_crash_client.Pointer()); 27 crash_reporter::SetCrashReporterClient(g_chrome_crash_client.Pointer());
34 breakpad::InitCrashReporter(process_type); 28 breakpad::InitCrashReporter(process_type);
35 29
36 return nacl::NaClWin64Main(); 30 return nacl::NaClWin64Main();
37 } 31 }
OLDNEW
« no previous file with comments | « chrome/nacl/DEPS ('k') | chrome/test/base/chrome_test_launcher.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698