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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/sync_file_system/conflict_resolution_policy.h

Issue 188293005: [SyncFS] Add UMAs to track syncfs usage (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 9 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
« no previous file with comments | « chrome/browser/extensions/api/sync_file_system/sync_file_system_api_helpers.cc ('k') | chrome/browser/sync_file_system/drive_backend/metadata_database_index.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/sync_file_system/conflict_resolution_policy.h
diff --git a/chrome/browser/sync_file_system/conflict_resolution_policy.h b/chrome/browser/sync_file_system/conflict_resolution_policy.h
index 648ed2c2db1a53f6ad9693ed3fbac1cc0d917aeb..f451d071a5f6352e56f7211e0aec84064054160c 100644
--- a/chrome/browser/sync_file_system/conflict_resolution_policy.h
+++ b/chrome/browser/sync_file_system/conflict_resolution_policy.h
@@ -9,7 +9,7 @@ namespace sync_file_system {
enum ConflictResolutionPolicy {
// Resolution policy unknown or not initialized. Usually indicates an error.
- CONFLICT_RESOLUTION_POLICY_UNKNOWN,
+ CONFLICT_RESOLUTION_POLICY_UNKNOWN = 0,
// The service automatically resolves a conflict by choosing the one
// that is updated more recently.
@@ -18,6 +18,8 @@ enum ConflictResolutionPolicy {
// The service does nothing and just leaves conflicting files in
// 'conflicted' state.
CONFLICT_RESOLUTION_POLICY_MANUAL,
+
+ CONFLICT_RESOLUTION_POLICY_MAX,
};
} // namespace sync_file_system
« no previous file with comments | « chrome/browser/extensions/api/sync_file_system/sync_file_system_api_helpers.cc ('k') | chrome/browser/sync_file_system/drive_backend/metadata_database_index.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698