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

Side by Side Diff: ui/views/widget/desktop_aura/desktop_window_tree_host_x11_unittest.cc

Issue 823133004: Cleanup: Update the path to gfx rect headers. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rect_f.h Created 5 years, 11 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 unified diff | Download patch
OLDNEW
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 "base/run_loop.h" 15 #include "base/run_loop.h"
16 #include "ui/aura/window.h" 16 #include "ui/aura/window.h"
17 #include "ui/aura/window_tree_host.h" 17 #include "ui/aura/window_tree_host.h"
18 #include "ui/base/hit_test.h" 18 #include "ui/base/hit_test.h"
19 #include "ui/base/x/x11_util.h" 19 #include "ui/base/x/x11_util.h"
20 #include "ui/events/platform/x11/x11_event_source.h" 20 #include "ui/events/platform/x11/x11_event_source.h"
21 #include "ui/gfx/geometry/point.h" 21 #include "ui/gfx/geometry/point.h"
22 #include "ui/gfx/geometry/rect.h"
22 #include "ui/gfx/path.h" 23 #include "ui/gfx/path.h"
23 #include "ui/gfx/rect.h"
24 #include "ui/gfx/x/x11_atom_cache.h" 24 #include "ui/gfx/x/x11_atom_cache.h"
25 #include "ui/views/test/views_test_base.h" 25 #include "ui/views/test/views_test_base.h"
26 #include "ui/views/test/x11_property_change_waiter.h" 26 #include "ui/views/test/x11_property_change_waiter.h"
27 #include "ui/views/widget/desktop_aura/desktop_native_widget_aura.h" 27 #include "ui/views/widget/desktop_aura/desktop_native_widget_aura.h"
28 #include "ui/views/widget/widget_delegate.h" 28 #include "ui/views/widget/widget_delegate.h"
29 #include "ui/views/window/non_client_view.h" 29 #include "ui/views/window/non_client_view.h"
30 30
31 namespace views { 31 namespace views {
32 32
33 namespace { 33 namespace {
(...skipping 414 matching lines...) Expand 10 before | Expand all | Expand 10 after
448 SubstructureRedirectMask | SubstructureNotifyMask, 448 SubstructureRedirectMask | SubstructureNotifyMask,
449 &xevent); 449 &xevent);
450 450
451 WMStateWaiter waiter(xid, "_NET_WM_STATE_FOCUSED", true); 451 WMStateWaiter waiter(xid, "_NET_WM_STATE_FOCUSED", true);
452 waiter.Wait(); 452 waiter.Wait();
453 } 453 }
454 EXPECT_TRUE(widget.GetNativeWindow()->IsVisible()); 454 EXPECT_TRUE(widget.GetNativeWindow()->IsVisible());
455 } 455 }
456 456
457 } // namespace views 457 } // namespace views
OLDNEW
« no previous file with comments | « ui/views/widget/desktop_aura/desktop_window_tree_host_x11_interactive_uitest.cc ('k') | ui/views/widget/monitor_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698