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

Side by Side Diff: chrome/utility/utility_main.cc

Issue 7042003: Revert 85732 (broke build) - Move SystemMonitor to base/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 7 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
« no previous file with comments | « chrome/nacl/nacl_main.cc ('k') | chrome_frame/test/net/fake_external_tab.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) 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 "base/command_line.h" 5 #include "base/command_line.h"
6 #include "base/message_loop.h" 6 #include "base/message_loop.h"
7 #include "base/system_monitor/system_monitor.h"
8 #include "base/threading/platform_thread.h" 7 #include "base/threading/platform_thread.h"
9 #include "chrome/common/chrome_paths.h" 8 #include "chrome/common/chrome_paths.h"
10 #include "chrome/common/extensions/extension_l10n_util.h" 9 #include "chrome/common/extensions/extension_l10n_util.h"
11 #include "chrome/utility/utility_thread.h" 10 #include "chrome/utility/utility_thread.h"
12 #include "content/common/child_process.h" 11 #include "content/common/child_process.h"
13 #include "content/common/hi_res_timer_manager.h" 12 #include "content/common/hi_res_timer_manager.h"
14 #include "content/common/main_function_params.h" 13 #include "content/common/main_function_params.h"
14 #include "ui/base/system_monitor/system_monitor.h"
15 #include "ui/base/ui_base_switches.h" 15 #include "ui/base/ui_base_switches.h"
16 16
17 #if defined(OS_WIN) 17 #if defined(OS_WIN)
18 #include "base/file_util.h" 18 #include "base/file_util.h"
19 #include "base/path_service.h" 19 #include "base/path_service.h"
20 #include "chrome/common/chrome_switches.h" 20 #include "chrome/common/chrome_switches.h"
21 #include "content/common/sandbox_init_wrapper.h" 21 #include "content/common/sandbox_init_wrapper.h"
22 #include "sandbox/src/sandbox.h" 22 #include "sandbox/src/sandbox.h"
23 #endif // defined(OS_WIN) 23 #endif // defined(OS_WIN)
24 24
25 // Mainline routine for running as the utility process. 25 // Mainline routine for running as the utility process.
26 int UtilityMain(const MainFunctionParams& parameters) { 26 int UtilityMain(const MainFunctionParams& parameters) {
27 // The main message loop of the utility process. 27 // The main message loop of the utility process.
28 MessageLoop main_message_loop; 28 MessageLoop main_message_loop;
29 base::PlatformThread::SetName("CrUtilityMain"); 29 base::PlatformThread::SetName("CrUtilityMain");
30 30
31 base::SystemMonitor system_monitor; 31 ui::SystemMonitor system_monitor;
32 HighResolutionTimerManager hi_res_timer_manager; 32 HighResolutionTimerManager hi_res_timer_manager;
33 33
34 ChildProcess utility_process; 34 ChildProcess utility_process;
35 utility_process.set_main_thread(new UtilityThread()); 35 utility_process.set_main_thread(new UtilityThread());
36 #if defined(OS_WIN) 36 #if defined(OS_WIN)
37 // Load the pdf plugin before the sandbox is turned on. This is for Windows 37 // Load the pdf plugin before the sandbox is turned on. This is for Windows
38 // only because we need this DLL only on Windows. 38 // only because we need this DLL only on Windows.
39 FilePath pdf; 39 FilePath pdf;
40 if (PathService::Get(chrome::FILE_PDF_PLUGIN, &pdf) && 40 if (PathService::Get(chrome::FILE_PDF_PLUGIN, &pdf) &&
41 file_util::PathExists(pdf)) { 41 file_util::PathExists(pdf)) {
(...skipping 13 matching lines...) Expand all
55 55
56 CommandLine* command_line = CommandLine::ForCurrentProcess(); 56 CommandLine* command_line = CommandLine::ForCurrentProcess();
57 std::string lang = command_line->GetSwitchValueASCII(switches::kLang); 57 std::string lang = command_line->GetSwitchValueASCII(switches::kLang);
58 if (!lang.empty()) 58 if (!lang.empty())
59 extension_l10n_util::SetProcessLocale(lang); 59 extension_l10n_util::SetProcessLocale(lang);
60 60
61 MessageLoop::current()->Run(); 61 MessageLoop::current()->Run();
62 62
63 return 0; 63 return 0;
64 } 64 }
OLDNEW
« no previous file with comments | « chrome/nacl/nacl_main.cc ('k') | chrome_frame/test/net/fake_external_tab.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698