Revert of Fixes _NET_ACTIVE_WINDOW support check in order to not always return no.

ui/views/widget/desktop_aura/x11_desktop_handler.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/x11_desktop_handler.h"
 
 #include <X11/Xatom.h>
 #include <X11/Xlib.h>
 
 #include "base/message_loop/message_loop.h"
@@ skipping 37 matching lines @@
       wm_supports_active_window_(false) {
   base::MessagePumpX11::Current()->AddDispatcherForRootWindow(this);
   aura::Env::GetInstance()->AddObserver(this);
 
   XWindowAttributes attr;
   XGetWindowAttributes(xdisplay_, x_root_window_, &attr);
   XSelectInput(xdisplay_, x_root_window_,
                attr.your_event_mask | PropertyChangeMask |
                StructureNotifyMask | SubstructureNotifyMask);
 
-  ::Window active_window;
-  wm_supports_active_window_ =
-    ui::GetXIDProperty(x_root_window_, "_NET_ACTIVE_WINDOW", &active_window) &&
-    active_window;
+  std::vector<Atom> atoms;
+  if (ui::GetAtomArrayProperty(x_root_window_, "_NET_ACTIVE_WINDOW", &atoms)) {
+    Atom active_window = atom_cache_.GetAtom("_NET_ACTIVE_WINDOW");
+    for (std::vector<Atom>::iterator iter = atoms.begin(); iter != atoms.end();
+         ++iter) {
+      if (*(iter) == active_window) {
+        wm_supports_active_window_ = true;
+        break;
+      }
+    }
+  }
 }
 
 X11DesktopHandler::~X11DesktopHandler() {
   aura::Env::GetInstance()->RemoveObserver(this);
   base::MessagePumpX11::Current()->RemoveDispatcherForRootWindow(this);
 }
 
 void X11DesktopHandler::ActivateWindow(::Window window) {
   if (wm_supports_active_window_) {
     DCHECK_EQ(gfx::GetXDisplay(), xdisplay_);
@@ skipping 50 matching lines @@
       break;
     default:
       NOTREACHED();
   }
 }
 
 bool X11DesktopHandler::Dispatch(const base::NativeEvent& event) {
   // Check for a change to the active window.
   switch (event->type) {
     case PropertyNotify: {
-      ::Atom active_window_atom = atom_cache_.GetAtom("_NET_ACTIVE_WINDOW");
+      ::Atom active_window = atom_cache_.GetAtom("_NET_ACTIVE_WINDOW");
 
       if (event->xproperty.window == x_root_window_ &&
-          event->xproperty.atom == active_window_atom) {
-        ::Window window;
-        if (ui::GetXIDProperty(x_root_window_, "_NET_ACTIVE_WINDOW", &window) &&
+          event->xproperty.atom == active_window) {
+        int window;
+        if (ui::GetIntProperty(x_root_window_, "_NET_ACTIVE_WINDOW", &window) &&
             window) {
-          OnActiveWindowChanged(window);
+          OnActiveWindowChanged(static_cast< ::Window>(window));
         }
       }
       break;
     }
   }
 
   return true;
 }
 
 void X11DesktopHandler::OnWindowInitialized(aura::Window* window) {
@@ skipping 14 matching lines @@
 
   DesktopWindowTreeHostX11* new_host =
       views::DesktopWindowTreeHostX11::GetHostForXID(xid);
   if (new_host)
     new_host->HandleNativeWidgetActivationChanged(true);
 
   current_window_ = xid;
 }
 
 }  // namespace views