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 #include <vector> | 5 #include <vector> |
6 | 6 |
7 #include <X11/extensions/shape.h> | 7 #include <X11/extensions/shape.h> |
8 #include <X11/Xlib.h> | 8 #include <X11/Xlib.h> |
9 | 9 |
10 // Get rid of X11 macros which conflict with gtest. | 10 // Get rid of X11 macros which conflict with gtest. |
11 #undef Bool | 11 #undef Bool |
12 #undef None | 12 #undef None |
13 | 13 |
14 #include "base/memory/scoped_ptr.h" | 14 #include "base/memory/scoped_ptr.h" |
15 #include "ui/aura/window.h" | 15 #include "ui/aura/window.h" |
16 #include "ui/aura/window_tree_host.h" | 16 #include "ui/aura/window_tree_host.h" |
17 #include "ui/base/hit_test.h" | 17 #include "ui/base/hit_test.h" |
18 #include "ui/base/x/x11_util.h" | 18 #include "ui/base/x/x11_util.h" |
19 #include "ui/events/platform/x11/x11_event_source.h" | 19 #include "ui/events/platform/x11/x11_event_source.h" |
| 20 #include "ui/gfx/geometry/point.h" |
20 #include "ui/gfx/path.h" | 21 #include "ui/gfx/path.h" |
21 #include "ui/gfx/point.h" | |
22 #include "ui/gfx/rect.h" | 22 #include "ui/gfx/rect.h" |
23 #include "ui/gfx/x/x11_atom_cache.h" | 23 #include "ui/gfx/x/x11_atom_cache.h" |
24 #include "ui/views/test/views_test_base.h" | 24 #include "ui/views/test/views_test_base.h" |
25 #include "ui/views/test/x11_property_change_waiter.h" | 25 #include "ui/views/test/x11_property_change_waiter.h" |
26 #include "ui/views/widget/desktop_aura/desktop_native_widget_aura.h" | 26 #include "ui/views/widget/desktop_aura/desktop_native_widget_aura.h" |
27 #include "ui/views/widget/widget_delegate.h" | 27 #include "ui/views/widget/widget_delegate.h" |
28 #include "ui/views/window/non_client_view.h" | 28 #include "ui/views/window/non_client_view.h" |
29 | 29 |
30 namespace views { | 30 namespace views { |
31 | 31 |
(...skipping 456 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
488 | 488 |
489 // |widget|'s X11 window should still be active. Reactivating |widget| should | 489 // |widget|'s X11 window should still be active. Reactivating |widget| should |
490 // update the widget's "active" state. | 490 // update the widget's "active" state. |
491 // Note: Activating a widget whose X11 window is not active does not | 491 // Note: Activating a widget whose X11 window is not active does not |
492 // synchronously update the widget's "active" state. | 492 // synchronously update the widget's "active" state. |
493 widget->Activate(); | 493 widget->Activate(); |
494 EXPECT_TRUE(widget->IsActive()); | 494 EXPECT_TRUE(widget->IsActive()); |
495 } | 495 } |
496 | 496 |
497 } // namespace views | 497 } // namespace views |
OLD | NEW |