chromeos-wm: Fix a merge mistake.
chromeos-wm: Fix a merge mistake.

BUG=None
TEST=Built for tegra2_seaboard

Change-Id: I299afda23f3d450e2724ea14ffb358b39f69aff8

Review URL: http://codereview.chromium.org/5716008

joshfire/chromiumos-platform-window_manager,joshfire/chromiumos-platform-window_manager,joshfire/chromiumos-platform-window_manager,joshfire/chromiumos-platform-window_manager