Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / ui / views / widget / desktop_aura / x11_desktop_handler.cc

diff --git a/src/ui/views/widget/desktop_aura/x11_desktop_handler.cc b/src/ui/views/widget/desktop_aura/x11_desktop_handler.cc
index 6c25655..ee90cbc 100644 (file)
--- a/src/ui/views/widget/desktop_aura/x11_desktop_handler.cc
+++ b/src/ui/views/widget/desktop_aura/x11_desktop_handler.cc
@@ -58,8 +58,14 @@ X11DesktopHandler::X11DesktopHandler()
                attr.your_event_mask | PropertyChangeMask |
                StructureNotifyMask | SubstructureNotifyMask);
 
-  wm_supports_active_window_ =
-      ui::WmSupportsHint(atom_cache_.GetAtom("_NET_ACTIVE_WINDOW"));
+  if (ui::GuessWindowManager() == ui::WM_WMII) {
+    // wmii says that it supports _NET_ACTIVE_WINDOW but does not.
+    // https://code.google.com/p/wmii/issues/detail?id=266
+    wm_supports_active_window_ = false;
+  } else {
+    wm_supports_active_window_ =
+        ui::WmSupportsHint(atom_cache_.GetAtom("_NET_ACTIVE_WINDOW"));
+  }
 }
 
 X11DesktopHandler::~X11DesktopHandler() {