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

Unified Diff: chrome/nacl/nacl_main.cc

Issue 431008: Make SystemMonitor not a Singleton and move it out of base (Closed) Base URL: http://src.chromium.org/svn/trunk/src/
Patch Set: fix ChromeFrame build Created 11 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 side-by-side diff with in-line comments
Download patch
Index: chrome/nacl/nacl_main.cc
diff --git a/chrome/nacl/nacl_main.cc b/chrome/nacl/nacl_main.cc
index 05164956d4f6f560afb97635646ce000804a252f..5271cf4b1837d094c237e044dca42840b0d2424e 100644
--- a/chrome/nacl/nacl_main.cc
+++ b/chrome/nacl/nacl_main.cc
@@ -10,10 +10,11 @@
#include "sandbox/src/sandbox.h"
#endif
+#include "app/hi_res_timer_manager.h"
+#include "app/system_monitor.h"
#include "base/command_line.h"
#include "base/message_loop.h"
#include "base/string_util.h"
-#include "base/system_monitor.h"
#include "chrome/common/child_process.h"
#include "chrome/common/chrome_constants.h"
#include "chrome/common/chrome_switches.h"
@@ -28,8 +29,8 @@ int NaClMain(const MainFunctionParams& parameters) {
std::wstring app_name = chrome::kBrowserAppName;
PlatformThread::SetName(WideToASCII(app_name + L"_NaClMain").c_str());
- // Initialize the SystemMonitor
- base::SystemMonitor::Start();
+ SystemMonitor system_monitor;
+ HighResolutionTimerManager hi_res_timer_manager;
#if defined(OS_WIN)
const CommandLine& parsed_command_line = parameters.command_line_;

Powered by Google App Engine
This is Rietveld 408576698