chrome/chrome_browser.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: chrome/chrome_browser.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: chrome/chrome_browser.gypi

diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi

index b9b01235be2f8bf951a51092f1f3da40c0c678b0..1dc305ea7440c06bb8f5fa67a70deeee1873fd62 100644

--- a/chrome/chrome_browser.gypi

+++ b/chrome/chrome_browser.gypi

@@ -1083,11 +1083,6 @@

'browser/fav_icon_helper.h',

'browser/favicon_service.cc',

'browser/favicon_service.h',

- 'browser/file_path_watcher/file_path_watcher.cc',

- 'browser/file_path_watcher/file_path_watcher.h',

- 'browser/file_path_watcher/file_path_watcher_inotify.cc',

- 'browser/file_path_watcher/file_path_watcher_mac.cc',

- 'browser/file_path_watcher/file_path_watcher_win.cc',

'browser/file_select_helper.cc',

'browser/file_select_helper.h',

'browser/first_run/first_run.cc',

@@ -3528,7 +3523,6 @@

}, { # OS != "linux"

'sources!': [

- 'browser/file_path_watcher/file_path_watcher_inotify.cc',

'browser/ui/webui/options/certificate_manager_handler.cc',

'browser/ui/webui/options/certificate_manager_handler.h',

@@ -3540,9 +3534,6 @@

'../build/linux/system.gyp:nss',

'../build/linux/system.gyp:x11',

- 'sources': [

- 'browser/file_path_watcher/file_path_watcher_stub.cc',

- ],

}],

# Use system SSL settings on Mac and Windows. Use preferences

# for SSL settings on other platforms.

« no previous file with comments | « chrome/browser/user_style_sheet_watcher_unittest.cc ('k') | chrome/chrome_common.gypi » ('j') | no next file with comments »