BASELINE: Update Chromium to 85.0.4183.14085-based

Change-Id: Iaa42f4680837c57725b1344f108c0196741f6057
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>

1 files changed, 7 insertions, 7 deletions

diff --git a/chromium/components/exo/wayland/zxdg_shell.h b/chromium/components/exo/wayland/zxdg_shell.h
index f5112d36170..026a8bbc690 100644
--- a/chromium/components/exo/wayland/zxdg_shell.h
+++ b/chromium/components/exo/wayland/zxdg_shell.h
@@ -17,8 +17,8 @@ class Display;
 namespace wayland {
 class SerialTracker;
 
-struct WaylandXdgShell {
-  WaylandXdgShell(Display* display, SerialTracker* serial_tracker)
+struct WaylandZxdgShell {
+  WaylandZxdgShell(Display* display, SerialTracker* serial_tracker)
       : display(display), serial_tracker(serial_tracker) {}
 
   // Owned by WaylandServerController, which always outlives zxdg_shell.
@@ -27,13 +27,13 @@ struct WaylandXdgShell {
   // Owned by Server, which always outlives zxdg_shell.
   SerialTracker* const serial_tracker;
 
-  DISALLOW_COPY_AND_ASSIGN(WaylandXdgShell);
+  DISALLOW_COPY_AND_ASSIGN(WaylandZxdgShell);
 };
 
-void bind_xdg_shell_v6(wl_client* client,
-                       void* data,
-                       uint32_t version,
-                       uint32_t id);
+void bind_zxdg_shell_v6(wl_client* client,
+                        void* data,
+                        uint32_t version,
+                        uint32_t id);
 
 }  // namespace wayland
 }  // namespace exo