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

Unified Diff: ui/views/controls/textfield/textfield.cc

Issue 331993009: MacViews: Run native Cocoa context menus to support Services. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Add VIEWS_EXPORT for unit test access 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
Index: ui/views/controls/textfield/textfield.cc
diff --git a/ui/views/controls/textfield/textfield.cc b/ui/views/controls/textfield/textfield.cc
index 9407f2d46311a5567321d21b8ffbbbadb03663d1..028951935e4b290c68756fb9c5f71f78a26de1fd 100644
--- a/ui/views/controls/textfield/textfield.cc
+++ b/ui/views/controls/textfield/textfield.cc
@@ -987,13 +987,11 @@ void Textfield::ShowContextMenuForView(View* source,
const gfx::Point& point,
ui::MenuSourceType source_type) {
UpdateContextMenu();
- ignore_result(context_menu_runner_->RunMenuAt(
- GetWidget(),
- NULL,
- gfx::Rect(point, gfx::Size()),
- MENU_ANCHOR_TOPLEFT,
- source_type,
- MenuRunner::HAS_MNEMONICS | MenuRunner::CONTEXT_MENU));
+ ignore_result(context_menu_runner_->RunMenuAt(GetWidget(),
+ NULL,
+ gfx::Rect(point, gfx::Size()),
+ MENU_ANCHOR_TOPLEFT,
+ source_type));
}
////////////////////////////////////////////////////////////////////////////////
@@ -1703,7 +1701,9 @@ void Textfield::UpdateContextMenu() {
if (controller_)
controller_->UpdateContextMenu(context_menu_contents_.get());
}
- context_menu_runner_.reset(new MenuRunner(context_menu_contents_.get()));
+ context_menu_runner_.reset(
+ new MenuRunner(context_menu_contents_.get(),
+ MenuRunner::HAS_MNEMONICS | MenuRunner::CONTEXT_MENU));
}
void Textfield::TrackMouseClicks(const ui::MouseEvent& event) {

Powered by Google App Engine
This is Rietveld 408576698