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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/sync/engine/syncer_types.h

Issue 371029: Remove unique naming. (Closed)
Patch Set: Ready and about to go in! 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/sync/engine/syncer_proto_util_unittest.cc ('k') | chrome/browser/sync/engine/syncer_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/sync/engine/syncer_types.h
diff --git a/chrome/browser/sync/engine/syncer_types.h b/chrome/browser/sync/engine/syncer_types.h
old mode 100644
new mode 100755
index 7d8eda4b0c263febc299784a08e5adc451c25f5f..0cb1e56f6aa38c27cf2e18e9de6b957e4bc446ff
--- a/chrome/browser/sync/engine/syncer_types.h
+++ b/chrome/browser/sync/engine/syncer_types.h
@@ -31,11 +31,6 @@ enum UpdateAttemptResponse {
// Conflicts with the local data representation. This can also mean that the
// entry doesn't currently make sense if we applied it.
CONFLICT,
-
- // This return value is only returned by AttemptToUpdateEntryWithoutMerge
- // if we have a name conflict. Users of AttemptToUpdateEntry should never
- // see this return value, we'll return CONFLICT.
- NAME_CONFLICT,
};
enum ServerUpdateProcessingResult {
« no previous file with comments | « chrome/browser/sync/engine/syncer_proto_util_unittest.cc ('k') | chrome/browser/sync/engine/syncer_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698