content/content_common.gypi - Issue 6825063: Patch for bug 74983 (among others) to be applied to M11 696 branch.

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: content/content_common.gypi

Issue 6825063: Patch for bug 74983 (among others) to be applied to M11 696 branch. (Closed) Base URL: svn://svn.chromium.org/chrome/branches/696/src

Patch Set: intentionally disabled mac tests. tested by hand. Created 9 years, 8 months 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 side-by-side diff with in-line comments

Download patch

Index: content/content_common.gypi

diff --git a/content/content_common.gypi b/content/content_common.gypi

index 42af15e2b3924f3667355ee4a757e8ff5b7e609c..920fdad9b19736a25df432f7735d9236333f6120 100644

--- a/content/content_common.gypi

+++ b/content/content_common.gypi

@@ -28,6 +28,11 @@

'common/content_constants.h',

'common/content_switches.cc',

'common/content_switches.h',

+ 'common/file_path_watcher/file_path_watcher.cc',

+ 'common/file_path_watcher/file_path_watcher.h',

+ 'common/file_path_watcher/file_path_watcher_inotify.cc',

+ 'common/file_path_watcher/file_path_watcher_mac.cc',

+ 'common/file_path_watcher/file_path_watcher_win.cc',

'common/file_system/file_system_dispatcher.cc',

'common/file_system/file_system_dispatcher.h',

'common/file_system/webfilesystem_callback_dispatcher.cc',

@@ -66,6 +71,16 @@

['OS=="win"', {

'msvs_guid': '062E9260-304A-4657-A74C-0D3AA1A0A0A4',

}],

+ ['OS!="linux"', {

+ 'sources!': [

+ 'common/file_path_watcher/file_path_watcher_inotify.cc',

+ ],

+ }],

+ ['OS=="freebsd" or OS=="openbsd"', {

+ 'sources': [

+ 'common/file_path_watcher/file_path_watcher_stub.cc',

+ ],

+ }],

« no previous file with comments | « content/common/file_path_watcher/file_path_watcher_win.cc ('k') | tools/valgrind/tsan/suppressions.txt » ('j') | no next file with comments »