| 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_VIEWS_TEST_X11_PROPERTY_CHANGE_WAITER_H_ | 5 #ifndef UI_VIEWS_TEST_X11_PROPERTY_CHANGE_WAITER_H_ |
| 6 #define UI_VIEWS_TEST_X11_PROPERTY_CHANGE_WAITER_H_ | 6 #define UI_VIEWS_TEST_X11_PROPERTY_CHANGE_WAITER_H_ |
| 7 | 7 |
| 8 #include <stdint.h> |
| 9 |
| 8 #include "base/callback.h" | 10 #include "base/callback.h" |
| 11 #include "base/macros.h" |
| 9 #include "base/memory/scoped_ptr.h" | 12 #include "base/memory/scoped_ptr.h" |
| 10 #include "ui/events/platform/platform_event_dispatcher.h" | 13 #include "ui/events/platform/platform_event_dispatcher.h" |
| 11 #include "ui/events/platform/platform_event_types.h" | 14 #include "ui/events/platform/platform_event_types.h" |
| 12 #include "ui/gfx/x/x11_types.h" | 15 #include "ui/gfx/x/x11_types.h" |
| 13 | 16 |
| 14 namespace ui { | 17 namespace ui { |
| 15 class ScopedEventDispatcher; | 18 class ScopedEventDispatcher; |
| 16 class X11AtomCache; | 19 class X11AtomCache; |
| 17 } | 20 } |
| 18 | 21 |
| (...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 55 scoped_ptr<ui::ScopedEventDispatcher> dispatcher_; | 58 scoped_ptr<ui::ScopedEventDispatcher> dispatcher_; |
| 56 | 59 |
| 57 scoped_ptr<ui::X11AtomCache> atom_cache_; | 60 scoped_ptr<ui::X11AtomCache> atom_cache_; |
| 58 | 61 |
| 59 DISALLOW_COPY_AND_ASSIGN(X11PropertyChangeWaiter); | 62 DISALLOW_COPY_AND_ASSIGN(X11PropertyChangeWaiter); |
| 60 }; | 63 }; |
| 61 | 64 |
| 62 } // namespace views | 65 } // namespace views |
| 63 | 66 |
| 64 #endif // UI_VIEWS_TEST_X11_PROPERTY_CHANGE_WAITER_H_ | 67 #endif // UI_VIEWS_TEST_X11_PROPERTY_CHANGE_WAITER_H_ |
| OLD | NEW |