Upstream version 7.35.139.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 46aef17..96d174a 100644 (file)
--- a/src/ui/views/widget/desktop_aura/x11_desktop_handler.cc
+++ b/src/ui/views/widget/desktop_aura/x11_desktop_handler.cc
@@ -104,21 +104,14 @@ bool X11DesktopHandler::IsActiveWindow(::Window window) const {
 
 void X11DesktopHandler::ProcessXEvent(const base::NativeEvent& event) {
   switch (event->type) {
-    case EnterNotify:
-      if (event->xcrossing.focus == True &&
-          current_window_ != event->xcrossing.window)
-        OnActiveWindowChanged(event->xcrossing.window);
-      break;
-    case LeaveNotify:
-      if (event->xcrossing.focus == False &&
-          current_window_ == event->xcrossing.window)
-        OnActiveWindowChanged(None);
-      break;
     case FocusIn:
-      if (event->xfocus.mode == NotifyNormal &&
-          current_window_ != event->xfocus.window)
+      if (current_window_ != event->xfocus.window)
         OnActiveWindowChanged(event->xfocus.window);
       break;
+    case FocusOut:
+      if (current_window_ == event->xfocus.window)
+        OnActiveWindowChanged(None);
+      break;
     default:
       NOTREACHED();
   }