OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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" |
(...skipping 24 matching lines...) Expand all Loading... |
35 #include "ui/views/views_delegate.h" | 35 #include "ui/views/views_delegate.h" |
36 #include "ui/views/widget/native_widget.h" | 36 #include "ui/views/widget/native_widget.h" |
37 #include "ui/views/widget/root_view.h" | 37 #include "ui/views/widget/root_view.h" |
38 #include "ui/views/window/dialog_delegate.h" | 38 #include "ui/views/window/dialog_delegate.h" |
39 | 39 |
40 #if defined(OS_WIN) | 40 #if defined(OS_WIN) |
41 #include "ui/views/test/test_views_delegate.h" | 41 #include "ui/views/test/test_views_delegate.h" |
42 #endif | 42 #endif |
43 #if defined(USE_AURA) | 43 #if defined(USE_AURA) |
44 #include "ui/aura/root_window.h" | 44 #include "ui/aura/root_window.h" |
| 45 #include "ui/views/touchui/gesture_recognizer.h" |
45 #endif | 46 #endif |
46 #if !defined(USE_WEBKIT_COMPOSITOR) | 47 #if !defined(USE_WEBKIT_COMPOSITOR) |
47 #include "ui/gfx/compositor/test/test_texture.h" | 48 #include "ui/gfx/compositor/test/test_texture.h" |
48 #endif | 49 #endif |
49 | 50 |
50 using ::testing::_; | 51 using ::testing::_; |
51 | 52 |
52 namespace { | 53 namespace { |
53 | 54 |
54 // Returns true if |ancestor| is an ancestor of |layer|. | 55 // Returns true if |ancestor| is an ancestor of |layer|. |
(...skipping 3376 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3431 // Move c1 to the front. The layers should have moved too. | 3432 // Move c1 to the front. The layers should have moved too. |
3432 content->ReorderChildView(c1, -1); | 3433 content->ReorderChildView(c1, -1); |
3433 EXPECT_EQ(c1->layer(), parent_layer->children()[1]); | 3434 EXPECT_EQ(c1->layer(), parent_layer->children()[1]); |
3434 EXPECT_EQ(c2->layer(), parent_layer->children()[0]); | 3435 EXPECT_EQ(c2->layer(), parent_layer->children()[0]); |
3435 } | 3436 } |
3436 #endif | 3437 #endif |
3437 | 3438 |
3438 #endif // VIEWS_COMPOSITOR | 3439 #endif // VIEWS_COMPOSITOR |
3439 | 3440 |
3440 } // namespace views | 3441 } // namespace views |
OLD | NEW |