diff options
| author | pkotwicz <pkotwicz@chromium.org> | 2014-09-23 13:47:42 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-09-23 20:48:20 +0000 |
| commit | 2973ee193b002e66a29d9a082520a3d88bb7a119 (patch) | |
| tree | 348c3c019e7640d741ddbeee7aaaee6e69ddeddd /ui/views | |
| parent | 68fcb34b8d1754d29c388745d24f70028ff6ed91 (diff) | |
| download | chromium_src-2973ee193b002e66a29d9a082520a3d88bb7a119.zip chromium_src-2973ee193b002e66a29d9a082520a3d88bb7a119.tar.gz chromium_src-2973ee193b002e66a29d9a082520a3d88bb7a119.tar.bz2 | |
Make check for whether _NET_ACTIVE_WINDOW is supported take into account _NET_SUPPORTED and _NET_SUPPORTING_WM_CHECK
BUG=416490
TEST=Manual
Review URL: https://codereview.chromium.org/591213004
Cr-Commit-Position: refs/heads/master@{#296226}
Diffstat (limited to 'ui/views')
| -rw-r--r-- | ui/views/widget/desktop_aura/x11_desktop_handler.cc | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/ui/views/widget/desktop_aura/x11_desktop_handler.cc b/ui/views/widget/desktop_aura/x11_desktop_handler.cc index 2ffd324..e4f6dea 100644 --- a/ui/views/widget/desktop_aura/x11_desktop_handler.cc +++ b/ui/views/widget/desktop_aura/x11_desktop_handler.cc @@ -58,10 +58,8 @@ X11DesktopHandler::X11DesktopHandler() 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; + ui::WmSupportsHint(atom_cache_.GetAtom("_NET_ACTIVE_WINDOW")); } X11DesktopHandler::~X11DesktopHandler() { |