| 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 4f512b40627b1ced59f75b7f9b8437d7a9c6dad4..ded035592f95d8b0342c47c92dc9c96db65a48f9 100644
|
| --- a/sync/internal_api/public/base/model_type.h
|
| +++ b/sync/internal_api/public/base/model_type.h
|
| @@ -99,6 +99,9 @@ enum ModelType {
|
| // by this user and can have restrictions applied. MANAGED_USERS and
|
| // MANAGED_USER_SETTINGS can not be encrypted.
|
| MANAGED_USERS,
|
| + // Managed user shared settings. Shared settings can be modified both by the
|
| + // manager and the supervised user.
|
| + MANAGED_USER_SHARED_SETTINGS,
|
| // Distilled articles.
|
| ARTICLES,
|
|
|
| @@ -110,10 +113,8 @@ enum ModelType {
|
| // Tab sync. This is a placeholder type, so that Sessions can be implicitly
|
| // enabled for history sync and tabs sync.
|
| PROXY_TABS,
|
| -
|
| FIRST_PROXY_TYPE = PROXY_TABS,
|
| LAST_PROXY_TYPE = PROXY_TABS,
|
| -
|
| LAST_USER_MODEL_TYPE = PROXY_TABS,
|
|
|
| // ---- Control Types ----
|
| @@ -125,7 +126,6 @@ enum ModelType {
|
| // Flags to enable experimental features.
|
| EXPERIMENTS,
|
| LAST_CONTROL_MODEL_TYPE = EXPERIMENTS,
|
| -
|
| LAST_REAL_MODEL_TYPE = LAST_CONTROL_MODEL_TYPE,
|
|
|
| // If you are adding a new sync datatype that is exposed to the user via the
|
| @@ -134,7 +134,6 @@ enum ModelType {
|
| // for sync include your new type.
|
| // In this case, be sure to also update the UserSelectableTypes() definition
|
| // in sync/syncable/model_type.cc.
|
| -
|
| MODEL_TYPE_COUNT,
|
| };
|
|
|
|
|