Pass in the time of the user's last activity timestamp with the NET_ACTIVE_WINDOW event

ui/views/widget/desktop_aura/desktop_window_tree_host_x11.cc

 // Copyright (c) 2012 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 "ui/views/widget/desktop_aura/desktop_window_tree_host_x11.h"
 
 #include <X11/extensions/shape.h>
 #include <X11/extensions/XInput2.h>
 #include <X11/Xatom.h>
 #include <X11/Xregion.h>
@@ skipping 1174 matching lines @@
     native_window_frame_borders_ = gfx::Insets(
         insets[2],
         insets[0],
         insets[3],
         insets[1]);
   } else {
     native_window_frame_borders_ = gfx::Insets();
   }
 }
 
+void DesktopWindowTreeHostX11::UpdateWMUserTime(
+    const ui::PlatformEvent& event) {
+  if (!IsActive())
+    return;
+
+  ui::EventType type = ui::EventTypeFromNative(event);
+  if (type == ui::ET_MOUSE_PRESSED ||
+      type == ui::ET_KEY_PRESSED ||
+      type == ui::ET_TOUCH_PRESSED) {

[Elliot Glaysher, 2014/06/05 20:46:33]

I'm pretty sure you want the released versions of these events too. Along with
mouse motion events. (See gdkinput-x11.cc in the libgtk2 source.)

+    unsigned long wm_user_time_ms = static_cast<unsigned long>(
+        ui::EventTimeFromNative(event).InMilliseconds());
+    XChangeProperty(xdisplay_,
+                    xwindow_,
+                    atom_cache_.GetAtom("_NET_WM_USER_TIME"),
+                    XA_CARDINAL,
+                    32,
+                    PropModeReplace,
+                    reinterpret_cast<const unsigned char *>(&wm_user_time_ms),
+                    1);
+    X11DesktopHandler::get()->set_wm_user_time_ms(wm_user_time_ms);
+  }
+}
+
 void DesktopWindowTreeHostX11::SetWMSpecState(bool enabled,
                                                 ::Atom state1,
                                                 ::Atom state2) {
   XEvent xclient;
   memset(&xclient, 0, sizeof(xclient));
   xclient.type = ClientMessage;
   xclient.xclient.window = xwindow_;
   xclient.xclient.message_type = atom_cache_.GetAtom("_NET_WM_STATE");
   xclient.xclient.format = 32;
   xclient.xclient.data.l[0] =
@@ skipping 193 matching lines @@
   // will ignore toplevel XMoveWindow commands.
   XSizeHints size_hints;
   size_hints.flags = PPosition;
   size_hints.x = bounds_.x();
   size_hints.y = bounds_.y();
   XSetWMNormalHints(xdisplay_, xwindow_, &size_hints);
 
   // If SHOW_STATE_INACTIVE, tell the window manager not to focus the window
   // when mapping. This is done by setting the _NET_WM_USER_TIME to 0. See e.g.
   // http://standards.freedesktop.org/wm-spec/latest/ar01s05.html
-  if (show_state == ui::SHOW_STATE_INACTIVE) {
-    unsigned long value = 0;
+  unsigned long wm_user_time_ms = (show_state == ui::SHOW_STATE_INACTIVE) ?
+      0 : X11DesktopHandler::get()->wm_user_time_ms();
+  if (show_state == ui::SHOW_STATE_INACTIVE || wm_user_time_ms != 0) {
     XChangeProperty(xdisplay_,
                     xwindow_,
                     atom_cache_.GetAtom("_NET_WM_USER_TIME"),
                     XA_CARDINAL,
                     32,
                     PropModeReplace,
-                    reinterpret_cast<const unsigned char *>(&value),
+                    reinterpret_cast<const unsigned char *>(&wm_user_time_ms),
                     1);
-  } else {
-    // TODO(piman): if this window was created in response to an X event, we
-    // should set the time to the server time of the event that caused this.
-    // https://crbug.com/355667
-    XDeleteProperty(
-        xdisplay_, xwindow_, atom_cache_.GetAtom("_NET_WM_USER_TIME"));
   }
 
   XMapWindow(xdisplay_, xwindow_);
 
   // We now block until our window is mapped. Some X11 APIs will crash and
   // burn if passed |xwindow_| before the window is mapped, and XMapWindow is
   // asynchronous.
   if (ui::X11EventSource::GetInstance())
     ui::X11EventSource::GetInstance()->BlockUntilWindowMapped(xwindow_);
   window_mapped_ = true;
@@ skipping 15 matching lines @@
           static_cast<XIDeviceEvent*>(event->xcookie.data)->event == xwindow_);
 }
 
 uint32_t DesktopWindowTreeHostX11::DispatchEvent(
     const ui::PlatformEvent& event) {
   XEvent* xev = event;
 
   TRACE_EVENT1("views", "DesktopWindowTreeHostX11::Dispatch",
                "event->type", event->type);
 
+  UpdateWMUserTime(event);
+
   // May want to factor CheckXEventForConsistency(xev); into a common location
   // since it is called here.
   switch (xev->type) {
     case EnterNotify:
     case LeaveNotify: {
       ui::MouseEvent mouse_event(xev);
       DispatchMouseEvent(&mouse_event);
       break;
     }
     case Expose: {
@@ skipping 249 matching lines @@
   if (linux_ui) {
     ui::NativeTheme* native_theme = linux_ui->GetNativeTheme(window);
     if (native_theme)
       return native_theme;
   }
 
   return ui::NativeTheme::instance();
 }
 
 }  // namespace views