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

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

https://codereview.chromium.org/428143002 added a way to enable sync types programmatically, i.e. without user choice. This should be reflected in the sync settings dialog.

BUG=403326
Committed: https://crrev.com/da3248829b975a5ed1d0b34b8f19ba6b27e41a99
Cr-Commit-Position: refs/heads/master@{#291657}

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

bauerb@chromium.org: Please review changes in webui and resources.

zea@chromium.org: Please review changes in sync.

https://codereview.chromium.org/494973003/diff/1/chrome/browser/sync/profile_...
File chrome/browser/sync/profile_sync_service.cc (right):

https://codereview.chromium.org/494973003/diff/1/chrome/browser/sync/profile_...
chrome/browser/sync/profile_sync_service.cc:1895: return Union(preferred_types,
GetDataTypesFromPreferenceProviders());
I think this should already have been in the previous CL.

https://codereview.chromium.org/494973003/diff/1/chrome/browser/sync/profile_...
File chrome/browser/sync/profile_sync_service.h (right):

https://codereview.chromium.org/494973003/diff/1/chrome/browser/sync/profile_...
chrome/browser/sync/profile_sync_service.h:638: virtual syncer::ModelTypeSet
GetNonUserChoicePreferredDataTypes() const;
Any better ideas for what this should be called?

[Bernhard Bauer, 2014-08-21 15:00:06]

LGTM

https://codereview.chromium.org/494973003/diff/1/chrome/browser/sync/profile_...
File chrome/browser/sync/profile_sync_service.h (right):

https://codereview.chromium.org/494973003/diff/1/chrome/browser/sync/profile_...
chrome/browser/sync/profile_sync_service.h:638: virtual syncer::ModelTypeSet
GetNonUserChoicePreferredDataTypes() const;
On 2014/08/21 09:12:24, Marc Treib wrote:
> Any better ideas for what this should be called?

GetForcedDataTypes?

[Nicolas Zea, 2014-08-21 23:33:54]

https://codereview.chromium.org/494973003/diff/1/chrome/browser/sync/profile_...
File chrome/browser/sync/profile_sync_service.cc (right):

https://codereview.chromium.org/494973003/diff/1/chrome/browser/sync/profile_...
chrome/browser/sync/profile_sync_service.cc:1895: return Union(preferred_types,
GetDataTypesFromPreferenceProviders());
On 2014/08/21 09:12:24, Marc Treib wrote:
> I think this should already have been in the previous CL.

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.

https://codereview.chromium.org/494973003/diff/1/chrome/browser/sync/profile_...
chrome/browser/sync/profile_sync_service.cc:1917: return
GetDataTypesFromPreferenceProviders();
For now we could look at the difference between the two. I.e.
ModelTypeSet::Difference(sync_prefs_.GetPreferredDataTypes(),
GetPreferredDataTypes).

https://codereview.chromium.org/494973003/diff/1/chrome/browser/sync/profile_...
File chrome/browser/sync/profile_sync_service.h (right):

https://codereview.chromium.org/494973003/diff/1/chrome/browser/sync/profile_...
chrome/browser/sync/profile_sync_service.h:638: virtual syncer::ModelTypeSet
GetNonUserChoicePreferredDataTypes() const;
On 2014/08/21 15:00:06, Bernhard Bauer wrote:
> On 2014/08/21 09:12:24, Marc Treib wrote:
> > Any better ideas for what this should be called?
> 
> GetForcedDataTypes?

SGTM

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

https://codereview.chromium.org/494973003/diff/1/chrome/browser/sync/profile_...
File chrome/browser/sync/profile_sync_service.cc (right):

https://codereview.chromium.org/494973003/diff/1/chrome/browser/sync/profile_...
chrome/browser/sync/profile_sync_service.cc:1895: return Union(preferred_types,
GetDataTypesFromPreferenceProviders());
On 2014/08/21 23:33:53, Nicolas Zea wrote:
> On 2014/08/21 09:12:24, Marc Treib wrote:
> > I think this should already have been in the previous CL.
> 
> 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.

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.

https://codereview.chromium.org/494973003/diff/1/chrome/browser/sync/profile_...
chrome/browser/sync/profile_sync_service.cc:1917: return
GetDataTypesFromPreferenceProviders();
On 2014/08/21 23:33:53, Nicolas Zea wrote:
> For now we could look at the difference between the two. I.e.
> ModelTypeSet::Difference(sync_prefs_.GetPreferredDataTypes(),
> GetPreferredDataTypes).

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?

https://codereview.chromium.org/494973003/diff/1/chrome/browser/sync/profile_...
File chrome/browser/sync/profile_sync_service.h (right):

https://codereview.chromium.org/494973003/diff/1/chrome/browser/sync/profile_...
chrome/browser/sync/profile_sync_service.h:638: virtual syncer::ModelTypeSet
GetNonUserChoicePreferredDataTypes() const;
On 2014/08/21 23:33:54, Nicolas Zea wrote:
> On 2014/08/21 15:00:06, Bernhard Bauer wrote:
> > On 2014/08/21 09:12:24, Marc Treib wrote:
> > > Any better ideas for what this should be called?
> > 
> > GetForcedDataTypes?
> 
> SGTM

Done.

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

lgtm

https://codereview.chromium.org/494973003/diff/1/chrome/browser/sync/profile_...
File chrome/browser/sync/profile_sync_service.cc (right):

https://codereview.chromium.org/494973003/diff/1/chrome/browser/sync/profile_...
chrome/browser/sync/profile_sync_service.cc:1917: return
GetDataTypesFromPreferenceProviders();
On 2014/08/22 08:36:38, Marc Treib wrote:
> On 2014/08/21 23:33:53, Nicolas Zea wrote:
> > For now we could look at the difference between the two. I.e.
> > ModelTypeSet::Difference(sync_prefs_.GetPreferredDataTypes(),
> > GetPreferredDataTypes).
> 
> 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?

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.

[Marc Treib, 2014-08-25 07:45:15]

The CQ bit was checked by treib@chromium.org

[commit-bot: I haz the power, 2014-08-25 07:46:05]

CQ is trying da patch. Follow status at
 https://chromium-status.appspot.com/cq/treib@chromium.org/494973003/60001

[commit-bot: I haz the power, 2014-08-25 11:09:02]

Committed patchset #4 (60001) as d0994a7a61b9eec10a3b8f2723c71ae976ad4dd5

[commit-bot: I haz the power, 2014-09-10 02:33:38]

Patchset 4 (id:??) landed as
https://crrev.com/da3248829b975a5ed1d0b34b8f19ba6b27e41a99
Cr-Commit-Position: refs/heads/master@{#291657}