| 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 "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 "ui/base/models/simple_menu_model.h" | 7 #include "ui/base/models/simple_menu_model.h" |
| 8 #include "chrome/browser/automation/ui_controls.h" | 8 #include "chrome/browser/automation/ui_controls.h" |
| 9 #include "chrome/test/interactive_ui/view_event_test_base.h" | 9 #include "chrome/test/base/view_event_test_base.h" |
| 10 #include "views/controls/button/button_dropdown.h" | 10 #include "views/controls/button/button_dropdown.h" |
| 11 | 11 |
| 12 class ButtonDropDownDragTest : public ViewEventTestBase, | 12 class ButtonDropDownDragTest : public ViewEventTestBase, |
| 13 ui::SimpleMenuModel::Delegate { | 13 ui::SimpleMenuModel::Delegate { |
| 14 public: | 14 public: |
| 15 ButtonDropDownDragTest() | 15 ButtonDropDownDragTest() |
| 16 : button_(NULL), | 16 : button_(NULL), |
| 17 ALLOW_THIS_IN_INITIALIZER_LIST(menu_model_(this)), | 17 ALLOW_THIS_IN_INITIALIZER_LIST(menu_model_(this)), |
| 18 menu_shown_(false), | 18 menu_shown_(false), |
| 19 menu_closed_(false) { | 19 menu_closed_(false) { |
| (...skipping 103 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 123 } | 123 } |
| 124 | 124 |
| 125 private: | 125 private: |
| 126 views::ButtonDropDown* button_; | 126 views::ButtonDropDown* button_; |
| 127 ui::SimpleMenuModel menu_model_; | 127 ui::SimpleMenuModel menu_model_; |
| 128 bool menu_shown_; | 128 bool menu_shown_; |
| 129 bool menu_closed_; | 129 bool menu_closed_; |
| 130 }; | 130 }; |
| 131 | 131 |
| 132 VIEW_TEST(ButtonDropDownDragTest, DragActivation) | 132 VIEW_TEST(ButtonDropDownDragTest, DragActivation) |
| OLD | NEW |