Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(41)

Unified Diff: ui/views/widget/desktop_aura/x11_desktop_handler.cc

Issue 549713003: Handle _NET_ACTIVE_WINDOW or FocusIn & FocusOut, not both. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/widget/desktop_aura/x11_desktop_handler.cc
diff --git a/ui/views/widget/desktop_aura/x11_desktop_handler.cc b/ui/views/widget/desktop_aura/x11_desktop_handler.cc
index d32192b27be50aa19c72d7ca84314481a5f4435b..2ffd324809e0c2cdf79f893709b8cc223ebce3cf 100644
--- a/ui/views/widget/desktop_aura/x11_desktop_handler.cc
+++ b/ui/views/widget/desktop_aura/x11_desktop_handler.cc
@@ -134,11 +134,13 @@ bool X11DesktopHandler::IsActiveWindow(::Window window) const {
void X11DesktopHandler::ProcessXEvent(XEvent* event) {
switch (event->type) {
case FocusIn:
- if (current_window_ != event->xfocus.window)
+ if (!wm_supports_active_window_ &&
+ current_window_ != event->xfocus.window)
OnActiveWindowChanged(event->xfocus.window, ACTIVE);
break;
case FocusOut:
- if (current_window_ == event->xfocus.window)
+ if (!wm_supports_active_window_ &&
+ current_window_ == event->xfocus.window)
OnActiveWindowChanged(None, NOT_ACTIVE);
break;
default:
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698