summaryrefslogtreecommitdiffstats
path: root/chrome/plugin
diff options
context:
space:
mode:
authormbelshe@google.com <mbelshe@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-12-13 20:48:36 +0000
committermbelshe@google.com <mbelshe@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-12-13 20:48:36 +0000
commit0a30765779382fa4cd46d47dab4db0ad607e7569 (patch)
treeae593d32fc4052115c428382f451bdd110bcf460 /chrome/plugin
parenta211dddeb82823e7bf1baa24eb9583f95db7de4e (diff)
downloadchromium_src-0a30765779382fa4cd46d47dab4db0ad607e7569.zip
chromium_src-0a30765779382fa4cd46d47dab4db0ad607e7569.tar.gz
chromium_src-0a30765779382fa4cd46d47dab4db0ad607e7569.tar.bz2
A new shot at the old system monitor changelist.
Review URL: http://codereview.chromium.org/12883 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@6974 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/plugin')
-rw-r--r--chrome/plugin/plugin_main.cc4
1 files changed, 4 insertions, 0 deletions
diff --git a/chrome/plugin/plugin_main.cc b/chrome/plugin/plugin_main.cc
index 3fcdc91..84aa0b5 100644
--- a/chrome/plugin/plugin_main.cc
+++ b/chrome/plugin/plugin_main.cc
@@ -4,6 +4,7 @@
#include "base/command_line.h"
#include "base/message_loop.h"
+#include "base/system_monitor.h"
#include "chrome/common/chrome_constants.h"
#include "chrome/common/chrome_switches.h"
#include "chrome/common/logging_chrome.h"
@@ -20,6 +21,9 @@ int PluginMain(CommandLine &parsed_command_line,
std::wstring app_name = chrome::kBrowserAppName;
PlatformThread::SetName(WideToASCII(app_name + L"_PluginMain").c_str());
+ // Initialize the SystemMonitor
+ base::SystemMonitor::Start();
+
CoInitialize(NULL);
DLOG(INFO) << "Started plugin with " <<
parsed_command_line.command_line_string();