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

Unified Diff: sync/internal_api/public/base/model_type.h

Issue 11734009: sync: Add ControlPreference protobuf and supporting code (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Daily rebase Created 7 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
« no previous file with comments | « sync/internal_api/base_node.cc ('k') | sync/internal_api/public/base_node.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sync/internal_api/public/base/model_type.h
diff --git a/sync/internal_api/public/base/model_type.h b/sync/internal_api/public/base/model_type.h
index c0ac0ed506b35794e1f13af2b016b08dab1184f6..d8a53486ef826e23bee2e5fbea43ddb64335f876 100644
--- a/sync/internal_api/public/base/model_type.h
+++ b/sync/internal_api/public/base/model_type.h
@@ -94,7 +94,10 @@ enum ModelType {
DEVICE_INFO,
// Flags to enable experimental features.
EXPERIMENTS,
- LAST_CONTROL_MODEL_TYPE = EXPERIMENTS,
+ // These preferences are never encrypted so that they can be applied before
+ // the encryption system is fully initialized.
+ PRIORITY_PREFERENCES,
+ LAST_CONTROL_MODEL_TYPE = PRIORITY_PREFERENCES,
LAST_REAL_MODEL_TYPE = LAST_CONTROL_MODEL_TYPE,
« no previous file with comments | « sync/internal_api/base_node.cc ('k') | sync/internal_api/public/base_node.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698