Fix collision calculation

Options: Display: Fix collision calculation

This is already fixed in MD Settings, but somehow the fix never made
it to Options.

BUG=671376
CQ_INCLUDE_TRYBOTS=master.tryserver.chromium.linux:closure_compilation

Committed: https://crrev.com/15ba5056faebb0489da4b7a48930057914945115
Cr-Commit-Position: refs/heads/master@{#437414}

[stevenjb, 2016-12-08 18:49:03]

Description was changed from

==========
Options: Display: Fix collision calculation

This is already fixed in MD Settings, but somehow the fix never made
it to Options.

BUG=671376
==========

to

==========
Options: Display: Fix collision calculation

This is already fixed in MD Settings, but somehow the fix never made
it to Options.

BUG=671376
CQ_INCLUDE_TRYBOTS=master.tryserver.chromium.linux:closure_compilation
==========

[stevenjb, 2016-12-08 18:49:24]

stevenjb@chromium.org changed reviewers:
+ michaelpg@chromium.org

[stevenjb, 2016-12-08 18:53:38]

stevenjb@chromium.org changed reviewers:
+ xiyuan@chromium.org

[stevenjb, 2016-12-08 18:53:38]

+xiyuan@ who, iirc, reviewed the original options code. Whoever has time to
review this first :)

For reference, here is the MD Settings version. It has some additional
re-factoring that I didn't add for Options, but the logic is effectively the
same:

https://cs.chromium.org/chromium/src/chrome/browser/resources/settings/device...

[xiyuan, 2016-12-08 20:36:58]

xiyuan@chromium.org changed reviewers:
+ afakhry@chromium.org

[xiyuan, 2016-12-08 20:36:59]

lgtm

+afakhry@ who is looking at a similar bug

[stevenjb, 2016-12-08 20:48:05]

The CQ bit was checked by stevenjb@chromium.org

[commit-bot: I haz the power, 2016-12-08 20:49:04]

CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2016-12-09 01:37:29]

CQ is committing da patch.

Bot data: {"patchset_id": 1, "attempt_start_ts": 1481230085422160, "parent_rev":
"7c32a15001334cd8347f3773d5ca0b5f8a92af65", "commit_rev":
"1eb965446e4c4e22b2884fdbea542aa44f9c95d8"}

[commit-bot: I haz the power, 2016-12-09 01:37:59]

Committed patchset #1 (id:1)

[commit-bot: I haz the power, 2016-12-09 01:40:29]

Description was changed from

==========
Options: Display: Fix collision calculation

This is already fixed in MD Settings, but somehow the fix never made
it to Options.

BUG=671376
CQ_INCLUDE_TRYBOTS=master.tryserver.chromium.linux:closure_compilation
==========

to

==========
Options: Display: Fix collision calculation

This is already fixed in MD Settings, but somehow the fix never made
it to Options.

BUG=671376
CQ_INCLUDE_TRYBOTS=master.tryserver.chromium.linux:closure_compilation

Committed: https://crrev.com/15ba5056faebb0489da4b7a48930057914945115
Cr-Commit-Position: refs/heads/master@{#437414}
==========

[commit-bot: I haz the power, 2016-12-09 01:40:30]

Patchset 1 (id:??) landed as
https://crrev.com/15ba5056faebb0489da4b7a48930057914945115
Cr-Commit-Position: refs/heads/master@{#437414}