From 3f03f1f2dfa411916fc5db22e32a05c6360d6bcc Mon Sep 17 00:00:00 2001 From: "ben@chromium.org" Date: Fri, 14 Jan 2011 21:31:07 +0000 Subject: Revert 71487 - Move SystemMonitor to src/ui/base/system_monitor. Move HiResTimerManager to src/chrome/common. BUG=none TEST=none TBR=brettw Review URL: http://codereview.chromium.org/6361002 TBR=ben@chromium.org git-svn-id: svn://svn.chromium.org/chrome/trunk/src@71489 0039d316-1c4b-4281-b951-d872f2087c98 --- app/app_base.gypi | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'app/app_base.gypi') diff --git a/app/app_base.gypi b/app/app_base.gypi index c35847f..126d04d 100644 --- a/app/app_base.gypi +++ b/app/app_base.gypi @@ -22,11 +22,14 @@ 'app_paths.cc', 'app_switches.h', 'app_switches.cc', - '../ui/base/system_monitor/system_monitor.cc', - '../ui/base/system_monitor/system_monitor.h', - '../ui/base/system_monitor/system_monitor_mac.mm', - '../ui/base/system_monitor/system_monitor_posix.cc', - '../ui/base/system_monitor/system_monitor_win.cc', + 'hi_res_timer_manager_posix.cc', + 'hi_res_timer_manager_win.cc', + 'hi_res_timer_manager.h', + 'system_monitor.cc', + 'system_monitor.h', + 'system_monitor_mac.mm', + 'system_monitor_posix.cc', + 'system_monitor_win.cc', ], 'conditions': [ ['OS!="linux" and OS!="freebsd" and OS!="openbsd"', { -- cgit v1.1