| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 #ifndef UI_PLATFORM_WINDOW_X11_X11_WINDOW_H_ | 5 #ifndef UI_PLATFORM_WINDOW_X11_X11_WINDOW_H_ |
| 6 #define UI_PLATFORM_WINDOW_X11_X11_WINDOW_H_ | 6 #define UI_PLATFORM_WINDOW_X11_X11_WINDOW_H_ |
| 7 | 7 |
| 8 #include "ui/events/platform/platform_event_dispatcher.h" | 8 #include "ui/events/platform/platform_event_dispatcher.h" |
| 9 #include "ui/gfx/geometry/rect.h" | 9 #include "ui/gfx/geometry/rect.h" |
| 10 #include "ui/gfx/x/x11_atom_cache.h" | 10 #include "ui/gfx/x/x11_atom_cache.h" |
| (...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 59 // is the bounds requested using XConfigureWindow, and |confirmed_bounds_| is | 59 // is the bounds requested using XConfigureWindow, and |confirmed_bounds_| is |
| 60 // the bounds the X11 server has set on the window. | 60 // the bounds the X11 server has set on the window. |
| 61 gfx::Rect requested_bounds_; | 61 gfx::Rect requested_bounds_; |
| 62 gfx::Rect confirmed_bounds_; | 62 gfx::Rect confirmed_bounds_; |
| 63 | 63 |
| 64 bool window_mapped_; | 64 bool window_mapped_; |
| 65 | 65 |
| 66 DISALLOW_COPY_AND_ASSIGN(X11Window); | 66 DISALLOW_COPY_AND_ASSIGN(X11Window); |
| 67 }; | 67 }; |
| 68 | 68 |
| 69 namespace test { |
| 70 |
| 71 // Sets the value of the |override_redirect| flag when creating an X11 window. |
| 72 // It is necessary to set this flag on for various tests, otherwise the call to |
| 73 // X11Window::Show() blocks because it never receives the MapNotify event. It is |
| 74 // unclear why this is necessary, but might be related to calls to |
| 75 // XInitThreads(). |
| 76 X11_WINDOW_EXPORT void SetUseOverrideRedirectWindowByDefault( |
| 77 bool override_redirect); |
| 78 |
| 79 } // namespace test |
| 80 |
| 69 } // namespace ui | 81 } // namespace ui |
| 70 | 82 |
| 71 #endif // UI_PLATFORM_WINDOW_X11_X11_WINDOW_H_ | 83 #endif // UI_PLATFORM_WINDOW_X11_X11_WINDOW_H_ |
| OLD | NEW |