Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(843)

Side by Side Diff: chrome/chrome.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:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 # Copyright (c) 2009 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2009 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 { 5 {
6 'variables': { 6 'variables': {
7 'chromium_code': 1, 7 'chromium_code': 1,
8 8
9 'variables': { 9 'variables': {
10 'version_py_path': 'tools/build/version.py', 10 'version_py_path': 'tools/build/version.py',
(...skipping 748 matching lines...) Expand 10 before | Expand all | Expand 10 after
759 'dependencies': [ 759 'dependencies': [
760 '../build/linux/system.gyp:selinux', 760 '../build/linux/system.gyp:selinux',
761 ], 761 ],
762 }], 762 }],
763 ['OS=="win"', { 763 ['OS=="win"', {
764 'include_dirs': [ 764 'include_dirs': [
765 'third_party/wtl/include', 765 'third_party/wtl/include',
766 ], 766 ],
767 }, { # else: OS != "win" 767 }, { # else: OS != "win"
768 'sources!': [ 768 'sources!': [
769 'common/hi_res_timer_manager.cc',
770 'common/hi_res_timer_manager.h',
769 'common/temp_scaffolding_stubs.h', 771 'common/temp_scaffolding_stubs.h',
770 ], 772 ],
771 }], 773 }],
772 ['OS=="win" or OS=="linux"', { 774 ['OS=="win" or OS=="linux"', {
773 'sources!': [ 775 'sources!': [
774 'common/temp_scaffolding_stubs.cc', 776 'common/temp_scaffolding_stubs.cc',
775 ], 777 ],
776 }], 778 }],
777 ], 779 ],
778 }, 780 },
(...skipping 6194 matching lines...) Expand 10 before | Expand all | Expand 10 after
6973 ] 6975 ]
6974 }], 6976 }],
6975 ], # 'conditions' 6977 ], # 'conditions'
6976 } 6978 }
6977 6979
6978 # Local Variables: 6980 # Local Variables:
6979 # tab-width:2 6981 # tab-width:2
6980 # indent-tabs-mode:nil 6982 # indent-tabs-mode:nil
6981 # End: 6983 # End:
6982 # vim: set expandtab tabstop=2 shiftwidth=2: 6984 # vim: set expandtab tabstop=2 shiftwidth=2:
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698