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 "base/message_loop.h" | 5 #include "base/message_loop.h" |
6 #include "base/utf_string_conversions.h" | 6 #include "base/utf_string_conversions.h" |
| 7 #include "chrome/test/base/ui_test_utils.h" |
7 #include "chrome/test/base/view_event_test_base.h" | 8 #include "chrome/test/base/view_event_test_base.h" |
8 #include "chrome/test/base/ui_test_utils.h" | |
9 #include "ui/base/models/simple_menu_model.h" | 9 #include "ui/base/models/simple_menu_model.h" |
10 #include "ui/ui_controls/ui_controls.h" | 10 #include "ui/ui_controls/ui_controls.h" |
11 #include "ui/views/controls/button/button_dropdown.h" | 11 #include "ui/views/controls/button/button_dropdown.h" |
12 | 12 |
13 class ButtonDropDownDragTest : public ViewEventTestBase, | 13 class ButtonDropDownDragTest : public ViewEventTestBase, |
14 ui::SimpleMenuModel::Delegate { | 14 ui::SimpleMenuModel::Delegate { |
15 public: | 15 public: |
16 ButtonDropDownDragTest() | 16 ButtonDropDownDragTest() |
17 : button_(NULL), | 17 : button_(NULL), |
18 ALLOW_THIS_IN_INITIALIZER_LIST(menu_model_(this)), | 18 ALLOW_THIS_IN_INITIALIZER_LIST(menu_model_(this)), |
(...skipping 110 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
129 bool menu_shown_; | 129 bool menu_shown_; |
130 bool menu_closed_; | 130 bool menu_closed_; |
131 }; | 131 }; |
132 | 132 |
133 #if defined(OS_WIN) | 133 #if defined(OS_WIN) |
134 #define MAYBE_DragActivation DISABLED_DragActivation | 134 #define MAYBE_DragActivation DISABLED_DragActivation |
135 #else | 135 #else |
136 #define MAYBE_DragActivation DragActivation | 136 #define MAYBE_DragActivation DragActivation |
137 #endif | 137 #endif |
138 VIEW_TEST(ButtonDropDownDragTest, MAYBE_DragActivation) | 138 VIEW_TEST(ButtonDropDownDragTest, MAYBE_DragActivation) |
OLD | NEW |