Disable checkboxes in the advanced sync settings overlay whose type is force-enabled.

chrome/browser/sync/profile_sync_service.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/sync/profile_sync_service.h"
 
 #include <cstddef>
 #include <map>
 #include <vector>
 
@@ skipping 1874 matching lines @@
   const syncer::ModelTypeSet preferred_types = GetPreferredDataTypes();
   const syncer::ModelTypeSet failed_types =
       failed_data_types_handler_.GetFailedTypes();
   return Difference(preferred_types, failed_types);
 }
 
 syncer::ModelTypeSet ProfileSyncService::GetPreferredDataTypes() const {
   const syncer::ModelTypeSet registered_types = GetRegisteredDataTypes();
   const syncer::ModelTypeSet preferred_types =
       sync_prefs_.GetPreferredDataTypes(registered_types);
-  return preferred_types;
+  return Union(preferred_types, GetDataTypesFromPreferenceProviders());

[Marc Treib, 2014/08/21 09:12:24]

I think this should already have been in the previous CL.

[Nicolas Zea, 2014/08/21 23:33:53]

Yes. This might actually be something we should merge into m38, if the logic is
being used there. Without this certain logic breaks (e.g. requesting sync
startup early, a couple other cases). If there are no forced types in m38 though
its stay in 39.

That said, it occurs to me that the GetDataTypesFromPreferenceProviders should
return the intersection with RegisteredTypes. Otherwise types that aren't
supported in that version are included.

[Marc Treib, 2014/08/22 08:36:38]

Intersection with RegisteredTypes done.
I don't think a merge will be necessary: Supervised users do use forced types,
but (for now) those are known at profile creation time and never change. They
also cannot (re)configure sync at all atm. So I think we'll be good without a
merge.

 }
 
 syncer::ModelTypeSet
 ProfileSyncService::GetPreferredDirectoryDataTypes() const {
   const syncer::ModelTypeSet registered_directory_types =
       GetRegisteredDirectoryDataTypes();
   const syncer::ModelTypeSet preferred_types =
       sync_prefs_.GetPreferredDataTypes(registered_directory_types);
-
   return Union(preferred_types, GetDataTypesFromPreferenceProviders());
 }
 
 syncer::ModelTypeSet
 ProfileSyncService::GetPreferredNonBlockingDataTypes() const {
   return sync_prefs_.GetPreferredDataTypes(GetRegisteredNonBlockingDataTypes());
 }
 
+syncer::ModelTypeSet
+ProfileSyncService::GetNonUserChoicePreferredDataTypes() const {
+  // TODO(treib,zea): When SyncPrefs also implements SyncTypePreferenceProvider,
+  // we'll need another way to distinguish user-choosable types from
+  // programmatically-enabled types.
+  return GetDataTypesFromPreferenceProviders();

[Nicolas Zea, 2014/08/21 23:33:53]

For now we could look at the difference between the two. I.e.
ModelTypeSet::Difference(sync_prefs_.GetPreferredDataTypes(),
GetPreferredDataTypes).

[Marc Treib, 2014/08/22 08:36:38]

That would give us the types that *can* be chosen by the user, i.e. the
complementary set, yes? Do you see an advantage of that over what I've been
doing?

[Nicolas Zea, 2014/08/22 17:26:47]

Note that I'm assuming GetPreferredDataTypes already includes the
GetDataTypesFromPreferenceProviders. So the difference would be those that are
in the forced set, but not in the sync_prefs_ set, which I believe is what we
want.

That said, now that I think about it there's not really any need to do a set
difference here, since the SyncPrefs aren't a SyncTypePreferenceProvider (yet).
So this is fine as is.

+}
+
 syncer::ModelTypeSet ProfileSyncService::GetRegisteredDataTypes() const {
   return Union(GetRegisteredDirectoryDataTypes(),
                GetRegisteredNonBlockingDataTypes());
 }
 
 syncer::ModelTypeSet
 ProfileSyncService::GetRegisteredDirectoryDataTypes() const {
   syncer::ModelTypeSet registered_types;
   // The directory_data_type_controllers_ are determined by command-line flags;
   // that's effectively what controls the values returned here.
@@ skipping 844 matching lines @@
                  true));
 }
 
 bool ProfileSyncService::NeedBackup() const {
   return need_backup_;
 }
 
 base::Time ProfileSyncService::GetDeviceBackupTimeForTesting() const {
   return backend_->GetSyncedDeviceTracker()->GetLocalDeviceBackupTime();
 }