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/callback.h" | 5 #include "base/callback.h" |
| 6 #include "base/location.h" |
| 7 #include "base/single_thread_task_runner.h" |
6 #include "base/strings/utf_string_conversions.h" | 8 #include "base/strings/utf_string_conversions.h" |
| 9 #include "base/thread_task_runner_handle.h" |
7 #include "chrome/test/base/interactive_test_utils.h" | 10 #include "chrome/test/base/interactive_test_utils.h" |
8 #include "chrome/test/base/ui_test_utils.h" | 11 #include "chrome/test/base/ui_test_utils.h" |
9 #include "chrome/test/base/view_event_test_base.h" | 12 #include "chrome/test/base/view_event_test_base.h" |
10 #include "ui/base/models/menu_model.h" | 13 #include "ui/base/models/menu_model.h" |
11 #include "ui/base/test/ui_controls.h" | 14 #include "ui/base/test/ui_controls.h" |
12 #include "ui/views/controls/button/menu_button.h" | 15 #include "ui/views/controls/button/menu_button.h" |
13 #include "ui/views/controls/button/menu_button_listener.h" | 16 #include "ui/views/controls/button/menu_button_listener.h" |
14 #include "ui/views/controls/menu/menu_controller.h" | 17 #include "ui/views/controls/menu/menu_controller.h" |
15 #include "ui/views/controls/menu/menu_item_view.h" | 18 #include "ui/views/controls/menu/menu_item_view.h" |
16 #include "ui/views/controls/menu/menu_model_adapter.h" | 19 #include "ui/views/controls/menu/menu_model_adapter.h" |
(...skipping 204 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
221 | 224 |
222 // Rebuild the menu which should close the submenu. | 225 // Rebuild the menu which should close the submenu. |
223 void Step2() { | 226 void Step2() { |
224 views::SubmenuView* topmenu = menu_->GetSubmenu(); | 227 views::SubmenuView* topmenu = menu_->GetSubmenu(); |
225 ASSERT_TRUE(topmenu); | 228 ASSERT_TRUE(topmenu); |
226 ASSERT_TRUE(topmenu->IsShowing()); | 229 ASSERT_TRUE(topmenu->IsShowing()); |
227 ASSERT_TRUE(top_menu_model_.IsSubmenuShowing()); | 230 ASSERT_TRUE(top_menu_model_.IsSubmenuShowing()); |
228 | 231 |
229 menu_model_adapter_.BuildMenu(menu_); | 232 menu_model_adapter_.BuildMenu(menu_); |
230 | 233 |
231 base::MessageLoopForUI::current()->PostTask( | 234 base::MessageLoopForUI::current()->task_runner()->PostTask( |
232 FROM_HERE, CreateEventTask(this, &MenuModelAdapterTest::Step3)); | 235 FROM_HERE, CreateEventTask(this, &MenuModelAdapterTest::Step3)); |
233 } | 236 } |
234 | 237 |
235 // Verify that the submenu MenuModel received the close callback | 238 // Verify that the submenu MenuModel received the close callback |
236 // and close the menu. | 239 // and close the menu. |
237 void Step3() { | 240 void Step3() { |
238 views::SubmenuView* topmenu = menu_->GetSubmenu(); | 241 views::SubmenuView* topmenu = menu_->GetSubmenu(); |
239 ASSERT_TRUE(topmenu); | 242 ASSERT_TRUE(topmenu); |
240 ASSERT_TRUE(topmenu->IsShowing()); | 243 ASSERT_TRUE(topmenu->IsShowing()); |
241 ASSERT_FALSE(top_menu_model_.IsSubmenuShowing()); | 244 ASSERT_FALSE(top_menu_model_.IsSubmenuShowing()); |
(...skipping 23 matching lines...) Expand all Loading... |
265 } | 268 } |
266 | 269 |
267 views::MenuButton* button_; | 270 views::MenuButton* button_; |
268 TopMenuModel top_menu_model_; | 271 TopMenuModel top_menu_model_; |
269 views::MenuModelAdapter menu_model_adapter_; | 272 views::MenuModelAdapter menu_model_adapter_; |
270 views::MenuItemView* menu_; | 273 views::MenuItemView* menu_; |
271 scoped_ptr<views::MenuRunner> menu_runner_; | 274 scoped_ptr<views::MenuRunner> menu_runner_; |
272 }; | 275 }; |
273 | 276 |
274 VIEW_TEST(MenuModelAdapterTest, RebuildMenu) | 277 VIEW_TEST(MenuModelAdapterTest, RebuildMenu) |
OLD | NEW |