summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpauljensen@chromium.org <pauljensen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-01-14 19:26:15 +0000
committerpauljensen@chromium.org <pauljensen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-01-14 19:26:15 +0000
commit7e3533da9cc6329190f0f7bc690ff5e0cbdd8979 (patch)
tree0c73f22c90eb70727c57f0fe41e6f8ea3cdcfdd3
parentb236a99d62aa30100de3266f4f6bcc276020c5c3 (diff)
downloadchromium_src-7e3533da9cc6329190f0f7bc690ff5e0cbdd8979.zip
chromium_src-7e3533da9cc6329190f0f7bc690ff5e0cbdd8979.tar.gz
chromium_src-7e3533da9cc6329190f0f7bc690ff5e0cbdd8979.tar.bz2
Revert 244779 "Call XSetInputFocus after XRaiseWindow when activ..."
Looks like it's causing DesktopScreenX11Test.GetWindowAtScreenPoint to fail. > Call XSetInputFocus after XRaiseWindow when activating. > > XRaiseWindow does not reliably set the focus. GTK code is doing the same > thing, see gdk/x11/gdkwindow-x11.c. > > BUG=None > > Review URL: https://codereview.chromium.org/137533006 TBR=mlamouri@chromium.org Review URL: https://codereview.chromium.org/137793005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@244787 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--ui/views/widget/desktop_aura/x11_desktop_handler.cc1
1 files changed, 0 insertions, 1 deletions
diff --git a/ui/views/widget/desktop_aura/x11_desktop_handler.cc b/ui/views/widget/desktop_aura/x11_desktop_handler.cc
index d618e6b..3a14e04 100644
--- a/ui/views/widget/desktop_aura/x11_desktop_handler.cc
+++ b/ui/views/widget/desktop_aura/x11_desktop_handler.cc
@@ -94,7 +94,6 @@ void X11DesktopHandler::ActivateWindow(::Window window) {
&xclient);
} else {
XRaiseWindow(xdisplay_, window);
- XSetInputFocus(xdisplay_, window, RevertToParent, CurrentTime);
OnActiveWindowChanged(window);
}
}