Add Sync datatype for shared managed user settings.

sync/internal_api/public/base/model_type.h

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 c618c45043dcdaa8ea5f967ac6b6b9dbecc0a5ce..319dfb0b6427fdf3cc7398fd65fa7c76ffa6e4c7 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,
   // App List items
@@ -112,10 +115,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,
-

[Nicolas Zea, 2013/12/17 19:33:17]

prefer that you leave these newlines in, they separate the actual types from the
helper enums

[Bernhard Bauer, 2013/12/17 19:48:11]

Done. I think that was just a merge conflict resolved badly. Thanks for catching
it!

   FIRST_PROXY_TYPE = PROXY_TABS,
   LAST_PROXY_TYPE = PROXY_TABS,
-
   LAST_USER_MODEL_TYPE = PROXY_TABS,
 
   // ---- Control Types ----
@@ -127,7 +128,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
@@ -136,7 +136,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,
 };