OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 <map> | 5 #include <map> |
6 | 6 |
7 #include "base/memory/scoped_ptr.h" | 7 #include "base/memory/scoped_ptr.h" |
8 #include "base/rand_util.h" | 8 #include "base/rand_util.h" |
9 #include "base/string_util.h" | 9 #include "base/string_util.h" |
10 #include "base/utf_string_conversions.h" | 10 #include "base/utf_string_conversions.h" |
11 #include "testing/gmock/include/gmock/gmock.h" | 11 #include "testing/gmock/include/gmock/gmock.h" |
12 #include "ui/base/clipboard/clipboard.h" | 12 #include "ui/base/clipboard/clipboard.h" |
13 #include "ui/base/keycodes/keyboard_codes.h" | 13 #include "ui/base/keycodes/keyboard_codes.h" |
14 #include "ui/base/models/simple_menu_model.h" | 14 #include "ui/base/models/simple_menu_model.h" |
15 #include "ui/gfx/canvas_skia.h" | 15 #include "ui/gfx/canvas_skia.h" |
16 #include "ui/gfx/compositor/compositor.h" | 16 #include "ui/gfx/compositor/compositor.h" |
17 #include "ui/gfx/compositor/layer.h" | 17 #include "ui/gfx/compositor/layer.h" |
18 #include "ui/gfx/compositor/layer_animator.h" | 18 #include "ui/gfx/compositor/layer_animator.h" |
19 #include "ui/gfx/compositor/test_compositor.h" | 19 #include "ui/gfx/compositor/test_compositor.h" |
20 #include "ui/gfx/compositor/test_texture.h" | 20 #include "ui/gfx/compositor/test_texture.h" |
21 #include "ui/gfx/path.h" | 21 #include "ui/gfx/path.h" |
22 #include "ui/gfx/transform.h" | 22 #include "ui/gfx/transform.h" |
| 23 #include "ui/views/window/dialog_delegate.h" |
23 #include "views/background.h" | 24 #include "views/background.h" |
24 #include "views/controls/button/button_dropdown.h" | 25 #include "views/controls/button/button_dropdown.h" |
25 #include "views/controls/button/checkbox.h" | 26 #include "views/controls/button/checkbox.h" |
26 #include "views/controls/native/native_view_host.h" | 27 #include "views/controls/native/native_view_host.h" |
27 #include "views/controls/scroll_view.h" | 28 #include "views/controls/scroll_view.h" |
28 #include "views/controls/textfield/textfield.h" | 29 #include "views/controls/textfield/textfield.h" |
29 #include "views/events/event.h" | 30 #include "views/events/event.h" |
30 #include "views/focus/accelerator_handler.h" | 31 #include "views/focus/accelerator_handler.h" |
31 #include "views/focus/view_storage.h" | 32 #include "views/focus/view_storage.h" |
32 #include "views/test/views_test_base.h" | 33 #include "views/test/views_test_base.h" |
33 #include "views/touchui/gesture_manager.h" | 34 #include "views/touchui/gesture_manager.h" |
34 #include "views/view.h" | 35 #include "views/view.h" |
35 #include "views/views_delegate.h" | 36 #include "views/views_delegate.h" |
36 #include "views/widget/native_widget.h" | 37 #include "views/widget/native_widget.h" |
37 #include "views/widget/root_view.h" | 38 #include "views/widget/root_view.h" |
38 #include "views/window/dialog_delegate.h" | |
39 | 39 |
40 #if defined(OS_WIN) | 40 #if defined(OS_WIN) |
41 #include "views/test/test_views_delegate.h" | 41 #include "views/test/test_views_delegate.h" |
42 #endif | 42 #endif |
43 #if defined(USE_AURA) | 43 #if defined(USE_AURA) |
44 #include "ui/aura/desktop.h" | 44 #include "ui/aura/desktop.h" |
45 #endif | 45 #endif |
46 | 46 |
47 using ::testing::_; | 47 using ::testing::_; |
48 | 48 |
(...skipping 3047 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3096 ScrambleTree(content); | 3096 ScrambleTree(content); |
3097 EXPECT_TRUE(ViewAndLayerTreeAreConsistent(content, content->layer())); | 3097 EXPECT_TRUE(ViewAndLayerTreeAreConsistent(content, content->layer())); |
3098 | 3098 |
3099 ScrambleTree(content); | 3099 ScrambleTree(content); |
3100 EXPECT_TRUE(ViewAndLayerTreeAreConsistent(content, content->layer())); | 3100 EXPECT_TRUE(ViewAndLayerTreeAreConsistent(content, content->layer())); |
3101 } | 3101 } |
3102 | 3102 |
3103 #endif // VIEWS_COMPOSITOR | 3103 #endif // VIEWS_COMPOSITOR |
3104 | 3104 |
3105 } // namespace views | 3105 } // namespace views |
OLD | NEW |