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

Issues Search
    My Issues | Starred     Open | Closed | All

Issue 11185064: FYI: Move conflict resolve + clean up afterwards (Closed)

Created:
8 years, 2 months ago by rlarocque
Modified:
8 years, 1 month ago
Reviewers:
CC:
chromium-reviews, Raghu Simha, haitaol1, akalin, tim (not reviewing)
Visibility:
Public.

Description

FYI: Move conflict resolve + clean up afterwards BUG=

Patch Set 1 #

Unified diffs Side-by-side diffs Delta from patch set Stats (+224 lines, -835 lines) Patch
M chrome/browser/sync/about_sync_util.cc View 4 chunks +0 lines, -4 lines 0 comments Download
M chrome/browser/sync/profile_sync_service_harness.cc View 3 chunks +2 lines, -8 lines 0 comments Download
M sync/engine/all_status.cc View 5 chunks +0 lines, -8 lines 0 comments Download
M sync/engine/apply_updates_command.cc View 4 chunks +59 lines, -7 lines 0 comments Download
M sync/engine/apply_updates_command_unittest.cc View 11 chunks +4 lines, -29 lines 0 comments Download
M sync/engine/conflict_resolver.h View 1 chunk +2 lines, -7 lines 0 comments Download
M sync/engine/conflict_resolver.cc View 7 chunks +17 lines, -28 lines 0 comments Download
M sync/engine/nudge_source.h View 1 chunk +0 lines, -2 lines 0 comments Download
M sync/engine/nudge_source.cc View 1 chunk +0 lines, -1 line 0 comments Download
M sync/engine/process_updates_command_unittest.cc View 1 chunk +0 lines, -1 line 0 comments Download
D sync/engine/resolve_conflicts_command.h View 1 chunk +0 lines, -32 lines 0 comments Download
D sync/engine/resolve_conflicts_command.cc View 1 chunk +0 lines, -42 lines 0 comments Download
M sync/engine/sync_scheduler_impl.cc View 3 chunks +3 lines, -13 lines 0 comments Download
M sync/engine/sync_scheduler_unittest.cc View 1 chunk +0 lines, -30 lines 0 comments Download
M sync/engine/syncer.h View 1 chunk +0 lines, -2 lines 0 comments Download
M sync/engine/syncer.cc View 3 chunks +0 lines, -40 lines 0 comments Download
M sync/engine/syncer_proto_util_unittest.cc View 1 chunk +0 lines, -1 line 0 comments Download
M sync/engine/syncer_unittest.cc View 9 chunks +13 lines, -24 lines 0 comments Download
M sync/engine/update_applicator.h View 3 chunks +22 lines, -4 lines 0 comments Download
M sync/engine/update_applicator.cc View 5 chunks +17 lines, -14 lines 0 comments Download
M sync/internal_api/debug_info_event_listener.h View 1 chunk +0 lines, -1 line 0 comments Download
M sync/internal_api/debug_info_event_listener.cc View 1 chunk +0 lines, -2 lines 0 comments Download
M sync/internal_api/js_sync_manager_observer.cc View 1 chunk +0 lines, -1 line 0 comments Download
M sync/internal_api/js_sync_manager_observer_unittest.cc View 2 chunks +1 line, -3 lines 0 comments Download
M sync/internal_api/public/engine/sync_status.h View 2 chunks +0 lines, -4 lines 0 comments Download
M sync/internal_api/public/engine/sync_status.cc View 2 chunks +0 lines, -2 lines 0 comments Download
M sync/internal_api/public/sessions/model_neutral_state.h View 1 chunk +0 lines, -3 lines 0 comments Download
M sync/internal_api/public/sessions/model_neutral_state.cc View 1 chunk +0 lines, -1 line 0 comments Download
M sync/internal_api/public/sessions/sync_session_snapshot.h View 3 chunks +0 lines, -6 lines 0 comments Download
M sync/internal_api/public/sessions/sync_session_snapshot.cc View 6 chunks +0 lines, -17 lines 0 comments Download
A + sync/internal_api/public/sessions/sync_session_snapshot_unittest.cc View 5 chunks +3 lines, -32 lines 0 comments Download
A sync/internal_api/public/sessions/sync_source_info_unittest.cc View 1 chunk +42 lines, -0 lines 0 comments Download
M sync/internal_api/sync_manager_impl.cc View 1 chunk +3 lines, -8 lines 0 comments Download
M sync/protocol/client_debug_info.proto View 1 chunk +1 line, -1 line 0 comments Download
M sync/protocol/get_updates_caller_info.proto View 1 chunk +2 lines, -1 line 0 comments Download
M sync/protocol/proto_enum_conversions_unittest.cc View 1 chunk +1 line, -1 line 0 comments Download
D sync/sessions/session_state.h View 1 chunk +0 lines, -33 lines 0 comments Download
D sync/sessions/session_state.cc View 1 chunk +0 lines, -26 lines 0 comments Download
D sync/sessions/session_state_unittest.cc View 1 chunk +0 lines, -134 lines 0 comments Download
M sync/sessions/status_controller.h View 6 chunks +11 lines, -54 lines 0 comments Download
M sync/sessions/status_controller.cc View 6 chunks +13 lines, -72 lines 0 comments Download
M sync/sessions/status_controller_unittest.cc View 3 chunks +4 lines, -43 lines 0 comments Download
M sync/sessions/sync_session.h View 6 chunks +2 lines, -16 lines 0 comments Download
M sync/sessions/sync_session.cc View 3 chunks +0 lines, -29 lines 0 comments Download
M sync/sessions/sync_session_unittest.cc View 4 chunks +0 lines, -32 lines 0 comments Download
M sync/sessions/test_util.h View 1 chunk +0 lines, -2 lines 0 comments Download
M sync/sessions/test_util.cc View 2 chunks +0 lines, -9 lines 0 comments Download
M sync/sync.gyp View 4 chunks +2 lines, -5 lines 0 comments Download

Powered by Google App Engine
This is Rietveld 408576698