Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(648)

Unified Diff: chrome/browser/ui/views/menu_test_base.cc

Issue 399143004: Open the WrenchMenu on mouseover when dragging a browser action (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Win/Test Fix Created 6 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/ui/views/menu_test_base.h ('k') | chrome/browser/ui/views/menu_view_drag_and_drop_test.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/views/menu_test_base.cc
diff --git a/chrome/browser/ui/views/menu_test_base.cc b/chrome/browser/ui/views/menu_test_base.cc
index da9ecdb66b8f78b9143c4fcf0f243a3091f4b7d7..c06ebfe1e3670dcb1b3fe8b9c0229c6105ab90c5 100644
--- a/chrome/browser/ui/views/menu_test_base.cc
+++ b/chrome/browser/ui/views/menu_test_base.cc
@@ -37,18 +37,26 @@ void MenuTestBase::KeyPress(ui::KeyboardCode keycode,
false, false, next);
}
+int MenuTestBase::GetMenuRunnerFlags() {
+ return views::MenuRunner::HAS_MNEMONICS;
+}
+
void MenuTestBase::SetUp() {
button_ = new views::MenuButton(
NULL, base::ASCIIToUTF16("Menu Test"), this, true);
menu_ = new views::MenuItemView(this);
BuildMenu(menu_);
- menu_runner_.reset(
- new views::MenuRunner(menu_, views::MenuRunner::HAS_MNEMONICS));
+ menu_runner_.reset(new views::MenuRunner(menu_, GetMenuRunnerFlags()));
ViewEventTestBase::SetUp();
}
void MenuTestBase::TearDown() {
+ // We cancel the menu first because certain operations (like a menu opened
+ // with views::MenuRunner::FOR_DROP) don't take kindly to simply pulling the
+ // runner out from under them.
+ menu_runner_->Cancel();
+
menu_runner_.reset();
menu_ = NULL;
ViewEventTestBase::TearDown();
« no previous file with comments | « chrome/browser/ui/views/menu_test_base.h ('k') | chrome/browser/ui/views/menu_view_drag_and_drop_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698