GitLab

This resolves the problem where the hardware cursor is shown in one
window when unified mode is turned on. We might not have an active pref
service yet, so move the checks that don't depend on preferences before
checking the pref service.

Bug: 805719
Change-Id: I92c1ea1a47a0cd63f695fc792e1fe025ee715962
Reviewed-on: https://chromium-review.googlesource.com/887288
Commit-Queue: Elliot Glaysher <erg@chromium.org>
Reviewed-by: Scott Violet <sky@chromium.org>
Cr-Commit-Position: refs/heads/master@{#532025}