| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include <X11/keysym.h> | 5 #include <X11/keysym.h> |
| 6 #include <X11/Xlib.h> | 6 #include <X11/Xlib.h> |
| 7 | 7 |
| 8 // X macro fail. | 8 // X macro fail. |
| 9 #if defined(RootWindow) | 9 #if defined(RootWindow) |
| 10 #undef RootWindow | 10 #undef RootWindow |
| (...skipping 241 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 252 } | 252 } |
| 253 marker_event->xclient.message_type = MarkerEventAtom(); | 253 marker_event->xclient.message_type = MarkerEventAtom(); |
| 254 XSendEvent(x_display_, x_window_, False, 0, marker_event); | 254 XSendEvent(x_display_, x_window_, False, 0, marker_event); |
| 255 new EventWaiter(closure, &Matcher); | 255 new EventWaiter(closure, &Matcher); |
| 256 } | 256 } |
| 257 private: | 257 private: |
| 258 aura::Window* RootWindowForPoint(const gfx::Point& point) { | 258 aura::Window* RootWindowForPoint(const gfx::Point& point) { |
| 259 // Most interactive_ui_tests run inside of the aura_test_helper | 259 // Most interactive_ui_tests run inside of the aura_test_helper |
| 260 // environment. This means that we can't rely on gfx::Screen and several | 260 // environment. This means that we can't rely on gfx::Screen and several |
| 261 // other things to work properly. Therefore we hack around this by | 261 // other things to work properly. Therefore we hack around this by |
| 262 // iterating across the windows owned DesktopRootWindowHostX11 since this | 262 // iterating across the windows owned DesktopWindowTreeHostX11 since this |
| 263 // doesn't rely on having a DesktopScreenX11. | 263 // doesn't rely on having a DesktopScreenX11. |
| 264 std::vector<aura::Window*> windows = | 264 std::vector<aura::Window*> windows = |
| 265 DesktopRootWindowHostX11::GetAllOpenWindows(); | 265 DesktopWindowTreeHostX11::GetAllOpenWindows(); |
| 266 for (std::vector<aura::Window*>::const_iterator it = windows.begin(); | 266 for (std::vector<aura::Window*>::const_iterator it = windows.begin(); |
| 267 it != windows.end(); ++it) { | 267 it != windows.end(); ++it) { |
| 268 if ((*it)->GetBoundsInScreen().Contains(point)) { | 268 if ((*it)->GetBoundsInScreen().Contains(point)) { |
| 269 return (*it)->GetRootWindow(); | 269 return (*it)->GetRootWindow(); |
| 270 } | 270 } |
| 271 } | 271 } |
| 272 | 272 |
| 273 NOTREACHED() << "Coulding find RW for " << point.ToString() << " among " | 273 NOTREACHED() << "Coulding find RW for " << point.ToString() << " among " |
| 274 << windows.size() << " RWs."; | 274 << windows.size() << " RWs."; |
| 275 return NULL; | 275 return NULL; |
| (...skipping 28 matching lines...) Expand all Loading... |
| 304 }; | 304 }; |
| 305 | 305 |
| 306 } // namespace | 306 } // namespace |
| 307 | 307 |
| 308 UIControlsAura* CreateUIControlsDesktopAura() { | 308 UIControlsAura* CreateUIControlsDesktopAura() { |
| 309 return new UIControlsDesktopX11(); | 309 return new UIControlsDesktopX11(); |
| 310 } | 310 } |
| 311 | 311 |
| 312 } // namespace test | 312 } // namespace test |
| 313 } // namespace views | 313 } // namespace views |
| OLD | NEW |