WIP

components/exo/wayland/server.cc

Index: components/exo/wayland/server.cc
diff --git a/components/exo/wayland/server.cc b/components/exo/wayland/server.cc
index bf00c8ee350cbdfe6855aa154b1cea16b0cc8385..864f3a4f0e39bc27f3e4d30fb1a903ee21cb4b4c 100644
--- a/components/exo/wayland/server.cc
+++ b/components/exo/wayland/server.cc
@@ -1923,6 +1923,19 @@ void remote_surface_set_title(wl_client* client,
       base::string16(base::UTF8ToUTF16(title)));
 }
 
+void remote_surface_set_icon_png_chunk(wl_client* client,
+                                       wl_resource* resource,
+                                       uint32_t flags,
+                                       wl_array* content) {
+  const char* data = static_cast<const char*>(content->data);
+  GetUserDataAs<ShellSurface>(resource)->SetIconChunk(
+      flags, std::string(data, data + content->size));
+}
+
+void remote_surface_reset_icon(wl_client* client, wl_resource* resource) {
+  GetUserDataAs<ShellSurface>(resource)->ResetIcon();
+}
+
 void remote_surface_set_top_inset(wl_client* client,
                                   wl_resource* resource,
                                   int32_t height) {
@@ -2045,6 +2058,8 @@ const struct zcr_remote_surface_v1_interface remote_surface_implementation = {
     remote_surface_set_systemui_visibility,
     remote_surface_set_always_on_top,
     remote_surface_unset_always_on_top,
+    remote_surface_set_icon_png_chunk,
+    remote_surface_reset_icon,
     remote_surface_ack_configure,
     remote_surface_move};
 
@@ -2091,7 +2106,7 @@ class WaylandRemoteShell : public WMHelper::MaximizeModeObserver,
   }
 
   bool IsMultiDisplaySupported() const {
-    return wl_resource_get_version(remote_shell_resource_) >= 5;
+    return wl_resource_get_version(remote_shell_resource_) >= 6;
   }
 
   std::unique_ptr<ShellSurface> CreateShellSurface(Surface* surface,
@@ -2394,7 +2409,7 @@ const struct zcr_remote_shell_v1_interface remote_shell_implementation = {
     remote_shell_destroy, remote_shell_get_remote_surface,
     remote_shell_get_notification_surface};
 
-const uint32_t remote_shell_version = 5;
+const uint32_t remote_shell_version = 6;
 
 void bind_remote_shell(wl_client* client,
                        void* data,