diff options
author | willchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-18 07:04:06 +0000 |
---|---|---|
committer | willchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-18 07:04:06 +0000 |
commit | 69803a4f13f3eb26b982e82493672367e984907a (patch) | |
tree | 7129dda29bb0b45ae287e3d0b8d6c34e83ae98cc /content/plugin/plugin_main.cc | |
parent | c7e136fc8a564f1a30ef6214e4f2b5d598cfbe94 (diff) | |
download | chromium_src-69803a4f13f3eb26b982e82493672367e984907a.zip chromium_src-69803a4f13f3eb26b982e82493672367e984907a.tar.gz chromium_src-69803a4f13f3eb26b982e82493672367e984907a.tar.bz2 |
Move SystemMonitor to base/.
I plan to use SystemMonitor in net/.
Fix up the Mac implementation not to use Cocoa APIs since @interface is not allowed in base.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/7015017
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@85732 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/plugin/plugin_main.cc')
-rw-r--r-- | content/plugin/plugin_main.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/content/plugin/plugin_main.cc b/content/plugin/plugin_main.cc index fef3e95..2dea5e6 100644 --- a/content/plugin/plugin_main.cc +++ b/content/plugin/plugin_main.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -12,13 +12,13 @@ #include "base/command_line.h" #include "base/message_loop.h" #include "base/string_util.h" +#include "base/system_monitor/system_monitor.h" #include "base/threading/platform_thread.h" #include "content/common/child_process.h" #include "content/common/content_switches.h" #include "content/common/hi_res_timer_manager.h" #include "content/common/main_function_params.h" #include "content/plugin/plugin_thread.h" -#include "ui/base/system_monitor/system_monitor.h" #if defined(OS_WIN) #include "content/common/injection_test_dll.h" @@ -86,7 +86,7 @@ int PluginMain(const MainFunctionParams& parameters) { MessageLoop main_message_loop(MessageLoop::TYPE_UI); base::PlatformThread::SetName("CrPluginMain"); - ui::SystemMonitor system_monitor; + base::SystemMonitor system_monitor; HighResolutionTimerManager high_resolution_timer_manager; const CommandLine& parsed_command_line = parameters.command_line_; |