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