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.gyp | |
| 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.gyp')
| -rw-r--r-- | app/app.gyp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/app.gyp b/app/app.gyp index de566ee..09231358 100644 --- a/app/app.gyp +++ b/app/app.gyp @@ -47,7 +47,6 @@ '../ui/base/dragdrop/os_exchange_data_win_unittest.cc', '../ui/base/models/tree_node_iterator_unittest.cc', '../ui/base/models/tree_node_model_unittest.cc', - '../ui/base/system_monitor/system_monitor_unittest.cc', 'data_pack_unittest.cc', 'l10n_util_mac_unittest.mm', 'l10n_util_unittest.cc', @@ -55,6 +54,7 @@ 'sql/connection_unittest.cc', 'sql/statement_unittest.cc', 'sql/transaction_unittest.cc', + 'system_monitor_unittest.cc', 'test_suite.h', 'test/data/resource.h', 'text_elider_unittest.cc', |