OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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/strings/utf_string_conversions.h" | 5 #include "base/strings/utf_string_conversions.h" |
6 #include "chrome/browser/ui/views/menu_test_base.h" | 6 #include "chrome/browser/ui/views/menu_test_base.h" |
7 #include "chrome/test/base/interactive_test_utils.h" | 7 #include "chrome/test/base/interactive_test_utils.h" |
8 #include "chrome/test/base/ui_test_utils.h" | 8 #include "chrome/test/base/ui_test_utils.h" |
9 #include "ui/aura/window.h" | 9 #include "ui/aura/window.h" |
10 #include "ui/base/test/ui_controls.h" | 10 #include "ui/base/test/ui_controls.h" |
(...skipping 19 matching lines...) Expand all Loading... |
30 next); | 30 next); |
31 } | 31 } |
32 | 32 |
33 void MenuTestBase::KeyPress(ui::KeyboardCode keycode, | 33 void MenuTestBase::KeyPress(ui::KeyboardCode keycode, |
34 const base::Closure& next) { | 34 const base::Closure& next) { |
35 ui_controls::SendKeyPressNotifyWhenDone( | 35 ui_controls::SendKeyPressNotifyWhenDone( |
36 GetWidget()->GetNativeView()->GetRootWindow(), keycode, false, false, | 36 GetWidget()->GetNativeView()->GetRootWindow(), keycode, false, false, |
37 false, false, next); | 37 false, false, next); |
38 } | 38 } |
39 | 39 |
| 40 int MenuTestBase::GetMenuRunnerFlags() { |
| 41 return views::MenuRunner::HAS_MNEMONICS; |
| 42 } |
| 43 |
40 void MenuTestBase::SetUp() { | 44 void MenuTestBase::SetUp() { |
41 button_ = new views::MenuButton( | 45 button_ = new views::MenuButton( |
42 NULL, base::ASCIIToUTF16("Menu Test"), this, true); | 46 NULL, base::ASCIIToUTF16("Menu Test"), this, true); |
43 menu_ = new views::MenuItemView(this); | 47 menu_ = new views::MenuItemView(this); |
44 BuildMenu(menu_); | 48 BuildMenu(menu_); |
45 menu_runner_.reset( | 49 menu_runner_.reset(new views::MenuRunner(menu_, GetMenuRunnerFlags())); |
46 new views::MenuRunner(menu_, views::MenuRunner::HAS_MNEMONICS)); | |
47 | 50 |
48 ViewEventTestBase::SetUp(); | 51 ViewEventTestBase::SetUp(); |
49 } | 52 } |
50 | 53 |
51 void MenuTestBase::TearDown() { | 54 void MenuTestBase::TearDown() { |
| 55 // We cancel the menu first because certain operations (like a menu opened |
| 56 // with views::MenuRunner::FOR_DROP) don't take kindly to simply pulling the |
| 57 // runner out from under them. |
| 58 menu_runner_->Cancel(); |
| 59 |
52 menu_runner_.reset(); | 60 menu_runner_.reset(); |
53 menu_ = NULL; | 61 menu_ = NULL; |
54 ViewEventTestBase::TearDown(); | 62 ViewEventTestBase::TearDown(); |
55 } | 63 } |
56 | 64 |
57 views::View* MenuTestBase::CreateContentsView() { | 65 views::View* MenuTestBase::CreateContentsView() { |
58 return button_; | 66 return button_; |
59 } | 67 } |
60 | 68 |
61 void MenuTestBase::DoTestOnMessageLoop() { | 69 void MenuTestBase::DoTestOnMessageLoop() { |
(...skipping 12 matching lines...) Expand all Loading... |
74 ignore_result(menu_runner_->RunMenuAt(source->GetWidget(), | 82 ignore_result(menu_runner_->RunMenuAt(source->GetWidget(), |
75 button_, | 83 button_, |
76 bounds, | 84 bounds, |
77 views::MENU_ANCHOR_TOPLEFT, | 85 views::MENU_ANCHOR_TOPLEFT, |
78 ui::MENU_SOURCE_NONE)); | 86 ui::MENU_SOURCE_NONE)); |
79 } | 87 } |
80 | 88 |
81 void MenuTestBase::ExecuteCommand(int id) { | 89 void MenuTestBase::ExecuteCommand(int id) { |
82 last_command_ = id; | 90 last_command_ = id; |
83 } | 91 } |
OLD | NEW |