diff options
| author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-14 21:31:07 +0000 |
|---|---|---|
| committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-14 21:31:07 +0000 |
| commit | 3f03f1f2dfa411916fc5db22e32a05c6360d6bcc (patch) | |
| tree | 51981422445df005dd7f8ae8783459fe18513d95 /app/app_base.gypi | |
| parent | 44f724478aa3b97e69c1609598b98b2cd03d9670 (diff) | |
| download | chromium_src-3f03f1f2dfa411916fc5db22e32a05c6360d6bcc.zip chromium_src-3f03f1f2dfa411916fc5db22e32a05c6360d6bcc.tar.gz chromium_src-3f03f1f2dfa411916fc5db22e32a05c6360d6bcc.tar.bz2 | |
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
Diffstat (limited to 'app/app_base.gypi')
| -rw-r--r-- | app/app_base.gypi | 13 |
1 files changed, 8 insertions, 5 deletions
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"', { |