Do not notify Wayland clients about activation which came from them.

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 <alpha-compositing-unstable-v1-server-protocol.h>
 #include <gaming-input-unstable-v1-server-protocol.h>
 #include <gaming-input-unstable-v2-server-protocol.h>
 #include <grp.h>
@@ skipping 140 matching lines @@
 DEFINE_UI_CLASS_PROPERTY_KEY(bool, kSurfaceHasViewportKey, false);
 
 // A property key containing a boolean set to true if a security object is
 // associated with window.
 DEFINE_UI_CLASS_PROPERTY_KEY(bool, kSurfaceHasSecurityKey, false);
 
 // A property key containing a boolean set to true if a blending object is
 // associated with window.
 DEFINE_UI_CLASS_PROPERTY_KEY(bool, kSurfaceHasBlendingKey, false);
 
+// A property key containing a boolean set to true whether the current
+// OnWindowActivated invocation should be ignored.
+DEFINE_UI_CLASS_PROPERTY_KEY(bool, kIgnoreWindowActivated, false);
+
 wl_resource* GetSurfaceResource(Surface* surface) {
   return surface->GetProperty(kSurfaceResourceKey);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // wl_buffer_interface:
 
 void buffer_destroy(wl_client* client, wl_resource* resource) {
   wl_resource_destroy(resource);
 }
@@ skipping 1748 matching lines @@
 
 void remote_surface_set_top_inset(wl_client* client,
                                   wl_resource* resource,
                                   int32_t height) {
   GetUserDataAs<ShellSurface>(resource)->SetTopInset(height);
 }
 
 void remote_surface_activate(wl_client* client,
                              wl_resource* resource,
                              uint32_t serial) {
+  ShellSurface* shell_surface = GetUserDataAs<ShellSurface>(resource);
+  aura::Window* window = shell_surface->GetWidget()->GetNativeWindow();
+
+  // Activation on Aura is synchronous, so activation callbacks will be called
+  // before the flag is reset.
+  window->SetProperty(kIgnoreWindowActivated, true);
   GetUserDataAs<ShellSurface>(resource)->Activate();
+  window->ClearProperty(kIgnoreWindowActivated);
 }
 
 void remote_surface_maximize(wl_client* client, wl_resource* resource) {
   GetUserDataAs<ShellSurface>(resource)->Maximize();
 }
 
 void remote_surface_minimize(wl_client* client, wl_resource* resource) {
   GetUserDataAs<ShellSurface>(resource)->Minimize();
 }
 
@@ skipping 174 matching lines @@
   }
   void OnMaximizeModeEnding() override {
     layout_mode_ = ZCR_REMOTE_SHELL_V1_LAYOUT_MODE_WINDOWED;
     ScheduleSendDisplayMetrics(kConfigureDelayAfterLayoutSwitchMs);
   }
   void OnMaximizeModeEnded() override {}
 
   // Overridden from WMHelper::ActivationObserver:
   void OnWindowActivated(aura::Window* gained_active,
                          aura::Window* lost_active) override {
+    // If the origin of activation is Wayland client, then assume it's been
+    // already activated on the client side, so do not notify about the
+    // activation. It means that zcr_remote_shell_v1_send_activated is used
+    // only to notify about activations originating in Aura.
+    if (gained_active && gained_active->GetProperty(kIgnoreWindowActivated))
+      return;
+
     SendActivated(gained_active, lost_active);
   }
 
  private:
   void ScheduleSendDisplayMetrics(int delay_ms) {
     needs_send_display_metrics_ = true;
     base::ThreadTaskRunnerHandle::Get()->PostDelayedTask(
         FROM_HERE, base::Bind(&WaylandRemoteShell::SendDisplayMetrics,
                               weak_ptr_factory_.GetWeakPtr()),
         base::TimeDelta::FromMilliseconds(delay_ms));
@@ skipping 1792 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