Add WM_EVENT_TRUSTED_PIN and WINDOW_STATE_TYPE_TRUSTED_PINNED to Ash.

components/exo/wayland/server.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "components/exo/wayland/server.h"
 
 #include <grp.h>
 #include <linux/input.h>
 #include <stddef.h>
 #include <stdint.h>
@@ skipping 1458 matching lines @@
 
 void remote_surface_minimize(wl_client* client, wl_resource* resource) {
   GetUserDataAs<ShellSurface>(resource)->Minimize();
 }
 
 void remote_surface_restore(wl_client* client, wl_resource* resource) {
   GetUserDataAs<ShellSurface>(resource)->Restore();
 }
 
 void remote_surface_pin(wl_client* client, wl_resource* resource) {
-  GetUserDataAs<ShellSurface>(resource)->SetPinned(true);
+  GetUserDataAs<ShellSurface>(resource)->SetPinned(true, /* trusted */ false);
 }
 
 void remote_surface_unpin(wl_client* client, wl_resource* resource) {
-  GetUserDataAs<ShellSurface>(resource)->SetPinned(false);
+  GetUserDataAs<ShellSurface>(resource)->SetPinned(false, /* trusted */ false);
 }
 
 void remote_surface_unfullscreen(wl_client* client, wl_resource* resource) {
   GetUserDataAs<ShellSurface>(resource)->SetFullscreen(false);
 }
 
 void remote_surface_set_rectangular_shadow(wl_client* client,
                                            wl_resource* resource,
                                            int32_t x,
                                            int32_t y,
@@ skipping 32 matching lines @@
   GetUserDataAs<ShellSurface>(resource)->SetRectangularShadowBackgroundOpacity(
       wl_fixed_to_double(opacity));
 }
 
 void remote_surface_activate(wl_client* client,
                              wl_resource* resource,
                              uint32_t serial) {
   GetUserDataAs<ShellSurface>(resource)->Activate();
 }
 
+void remote_surface_pin_with_trusted_flag(wl_client* client,
+                                          wl_resource* resource,
+                                          int32_t trusted) {
+  GetUserDataAs<ShellSurface>(resource)->SetPinned(true, trusted);
+}
+
 const struct zwp_remote_surface_v1_interface remote_surface_implementation = {
     remote_surface_destroy,
     remote_surface_set_app_id,
     remote_surface_set_window_geometry,
     remote_surface_set_scale,
     remote_surface_fullscreen,
     remote_surface_maximize,
     remote_surface_minimize,
     remote_surface_restore,
     remote_surface_pin,
     remote_surface_unpin,
     remote_surface_unfullscreen,
     remote_surface_set_rectangular_shadow,
     remote_surface_set_title,
     remote_surface_set_top_inset,
     remote_surface_set_system_modal,
     remote_surface_unset_system_modal,
     remote_surface_set_rectangular_shadow_background_opacity,
-    remote_surface_activate};
+    remote_surface_activate,
+    remote_surface_pin_with_trusted_flag};
 
 ////////////////////////////////////////////////////////////////////////////////
 // notification_surface_interface:
 
 void notification_surface_destroy(wl_client* client, wl_resource* resource) {
   wl_resource_destroy(resource);
 }
 
 const struct zwp_notification_surface_v1_interface
     notification_surface_implementation = {notification_surface_destroy};
@@ skipping 224 matching lines @@
         zwp_remote_surface_v1_send_unset_minimized(resource);
       break;
     case ash::wm::WINDOW_STATE_TYPE_MAXIMIZED:
       if (wl_resource_get_version(resource) >= 2)
         zwp_remote_surface_v1_send_unset_maximized(resource);
       break;
     case ash::wm::WINDOW_STATE_TYPE_FULLSCREEN:
       zwp_remote_surface_v1_send_unset_fullscreen(resource);
       break;
     case ash::wm::WINDOW_STATE_TYPE_PINNED:
+    case ash::wm::WINDOW_STATE_TYPE_TRUSTED_PINNED:
       if (wl_resource_get_version(resource) >= 3)
         zwp_remote_surface_v1_send_unset_pinned(resource);
       break;
     default:
       break;
   }
 
   uint32_t state_type = ZWP_REMOTE_SHELL_V1_STATE_TYPE_NORMAL;
   switch (new_state_type) {
     case ash::wm::WINDOW_STATE_TYPE_MINIMIZED:
       state_type = ZWP_REMOTE_SHELL_V1_STATE_TYPE_MINIMIZED;
       if (wl_resource_get_version(resource) >= 2)
         zwp_remote_surface_v1_send_set_minimized(resource);
       break;
     case ash::wm::WINDOW_STATE_TYPE_MAXIMIZED:
       state_type = ZWP_REMOTE_SHELL_V1_STATE_TYPE_MAXIMIZED;
       if (wl_resource_get_version(resource) >= 2)
         zwp_remote_surface_v1_send_set_maximized(resource);
       break;
     case ash::wm::WINDOW_STATE_TYPE_FULLSCREEN:
       state_type = ZWP_REMOTE_SHELL_V1_STATE_TYPE_FULLSCREEN;
       zwp_remote_surface_v1_send_set_fullscreen(resource);
       break;
     case ash::wm::WINDOW_STATE_TYPE_PINNED:
       state_type = ZWP_REMOTE_SHELL_V1_STATE_TYPE_PINNED;
       if (wl_resource_get_version(resource) >= 3)
         zwp_remote_surface_v1_send_set_pinned(resource);
       break;
+    case ash::wm::WINDOW_STATE_TYPE_TRUSTED_PINNED:
+      state_type = ZWP_REMOTE_SHELL_V1_STATE_TYPE_TRUSTED_PINNED;
+      if (wl_resource_get_version(resource) >= 3)
+        zwp_remote_surface_v1_send_set_pinned(resource);
+      break;
     default:
       break;
   }
 
   if (wl_resource_get_version(resource) >= 7)
     zwp_remote_surface_v1_send_state_type_changed(resource, state_type);

[hirono, 2016/09/05 23:27:38]

Only accelerator keys behave differently for pinning and locking. So we may be
able to use WINDOW_STATE_TYPE_PINNED for both pinning and locking with the
trusted flag.

The problem is that we report the Ash state to Android here. And we need to
distinguish the pinning and the locking in Android side. So if we use
WINDOW_STATE_TYPE_PINNED for both pinning and locking, we need to introduce a
new enum here which has different values for pinning and locking.

 
   wl_client_flush(wl_resource_get_client(resource));
 }
 
 void remote_shell_get_remote_surface(wl_client* client,
                                      wl_resource* resource,
                                      uint32_t id,
                                      wl_resource* surface,
                                      uint32_t container) {
   std::unique_ptr<ShellSurface> shell_surface =
@@ skipping 46 matching lines @@
                          wl_resource_get_version(resource), id);
   SetImplementation(notification_surface_resource,
                     &notification_surface_implementation,
                     std::move(notification_surface));
 }
 
 const struct zwp_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 = 10;
+const uint32_t remote_shell_version = 11;
 
 void bind_remote_shell(wl_client* client,
                        void* data,
                        uint32_t version,
                        uint32_t id) {
   wl_resource* resource =
       wl_resource_create(client, &zwp_remote_shell_v1_interface,
                          std::min(version, remote_shell_version), id);
 
   SetImplementation(resource, &remote_shell_implementation,
@@ skipping 1218 matching lines @@
   DCHECK(event_loop);
   wl_event_loop_dispatch(event_loop, timeout.InMilliseconds());
 }
 
 void Server::Flush() {
   wl_display_flush_clients(wl_display_.get());
 }
 
 }  // namespace wayland
 }  // namespace exo