chrome/nacl/nacl_main.cc - Issue 7042003: Revert 85732 (broke build) - Move SystemMonitor to base/.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/nacl/nacl_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:

Index: chrome/nacl/nacl_main.cc

===================================================================

--- chrome/nacl/nacl_main.cc (revision 85733)

+++ chrome/nacl/nacl_main.cc (working copy)

@@ -11,7 +11,6 @@

#include "base/command_line.h"

#include "base/message_loop.h"

#include "base/string_util.h"

-#include "base/system_monitor/system_monitor.h"

#include "chrome/common/chrome_constants.h"

#include "chrome/common/chrome_switches.h"

#include "chrome/common/logging_chrome.h"

@@ -22,6 +21,7 @@

#include "content/common/hi_res_timer_manager.h"

#include "content/common/main_function_params.h"

#include "content/common/result_codes.h"

+#include "ui/base/system_monitor/system_monitor.h"

#if defined(OS_WIN)

#include "chrome/nacl/broker_thread.h"

@@ -37,7 +37,7 @@

MessageLoopForIO main_message_loop;

base::PlatformThread::SetName("CrNaClBrokerMain");

- base::SystemMonitor system_monitor;

+ ui::SystemMonitor system_monitor;

HighResolutionTimerManager hi_res_timer_manager;

const CommandLine& parsed_command_line = parameters.command_line_;

@@ -101,7 +101,7 @@

MessageLoopForIO main_message_loop;

base::PlatformThread::SetName("CrNaClMain");

- base::SystemMonitor system_monitor;

+ ui::SystemMonitor system_monitor;

HighResolutionTimerManager hi_res_timer_manager;

#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX)

« no previous file with comments | « chrome/browser/tabs/tab_strip_model_unittest.cc ('k') | chrome/utility/utility_main.cc » ('j') | no next file with comments »