GitLab

Currently, Ozone/X11 defines gfx::AcceleratedWidget as
int32_t whereas non-Ozone/X11 defines that as x11::Window
or uint32_t. To fix the inconsistency and allow use_x11 &&
use_ozone builds, make non-Ozone/X11 uses Ozone's definition
of gfx::AcceleratedWidget.

Also adds missing includes.

Bug: 1098267
Change-Id: If9e98dd440c5d077990e390a0a10855723676b76
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2260554Reviewed-by: Tom Sepez <tsepez@chromium.org>
Reviewed-by: Thomas Anderson <thomasanderson@chromium.org>
Reviewed-by: Scott Violet <sky@chromium.org>
Commit-Queue: Maksim Sisov <msisov@igalia.com>
Cr-Commit-Position: refs/heads/master@{#782872}