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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/chrome.gyp

Issue 9305001: sync: Remove the remaining conflict sets code (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Review updates and renames Created 8 years, 11 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
« chrome/browser/sync/sessions/sync_session.cc ('K') | « chrome/browser/sync/sessions/sync_session_unittest.cc ('k') | chrome/chrome_tests.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/chrome.gyp
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp
index 61f7e67a1e40c7f5c8a17f7abd41a51e253a0570..cd2ea280ce3988cb85aebd4496b754ac89017214 100644
--- a/chrome/chrome.gyp
+++ b/chrome/chrome.gyp
@@ -366,8 +366,6 @@
'browser/sync/engine/all_status.h',
'browser/sync/engine/apply_updates_command.cc',
'browser/sync/engine/apply_updates_command.h',
- 'browser/sync/engine/build_and_process_conflict_sets_command.cc',
- 'browser/sync/engine/build_and_process_conflict_sets_command.h',
'browser/sync/engine/build_commit_command.cc',
'browser/sync/engine/build_commit_command.h',
'browser/sync/engine/cleanup_disabled_types_command.cc',
« chrome/browser/sync/sessions/sync_session.cc ('K') | « chrome/browser/sync/sessions/sync_session_unittest.cc ('k') | chrome/chrome_tests.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698