app/app.gyp - Issue 431008: Make SystemMonitor not a Singleton and move it out of 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: app/app.gyp

Issue 431008: Make SystemMonitor not a Singleton and move it out of base (Closed) Base URL: http://src.chromium.org/svn/trunk/src/

Patch Set: fix ChromeFrame build Created 11 years, 1 month 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: app/app.gyp

diff --git a/app/app.gyp b/app/app.gyp

index fbc9e2d6ac6187333d7235333d2cf141eda30d72..b2f73cf2150d036dbd3ed3a55ec9390331ca072a 100644

--- a/app/app.gyp

+++ b/app/app.gyp

@@ -132,6 +132,9 @@

'gfx/text_elider.h',

'gtk_dnd_util.cc',

'gtk_dnd_util.h',

+ 'hi_res_timer_manager_posix.cc',

+ 'hi_res_timer_manager_win.cc',

+ 'hi_res_timer_manager.h',

'l10n_util.cc',

'l10n_util.h',

'l10n_util_mac.h',

@@ -161,6 +164,10 @@

'sql/statement.h',

'sql/transaction.cc',

'sql/transaction.h',

+ 'system_monitor.cc',

+ 'system_monitor.h',

+ 'system_monitor_posix.cc',

+ 'system_monitor_win.cc',

'table_model.cc',

'table_model.h',

'table_model_observer.h',

@@ -271,6 +278,7 @@

'l10n_util_unittest.cc',

'os_exchange_data_win_unittest.cc',

'run_all_unittests.cc',

+ 'system_monitor_unittest.cc',

'test_suite.h',

'sql/connection_unittest.cc',

'sql/statement_unittest.cc',

« no previous file with comments | « no previous file | app/hi_res_timer_manager.h » ('j') | chrome/browser/session_history_uitest.cc » ('J')