Commit 3997c300 authored by msw@chromium.org's avatar msw@chromium.org

Rebuild Views Textfield context menu runner on each showing.

Without rebuilding, stale command states are used.
That may leave menu items incorrectly enabled/disabled.
Fixes a regression from http://crrev.com/244436

BUG=334604
TEST=Bug doesn't repro; omnibox and textfield context menu items are enabled or disabled as expected on each menu invocation.
R=sky@chromium.org

Review URL: https://codereview.chromium.org/137893017

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@245461 0039d316-1c4b-4281-b951-d872f2087c98
parent ccfc7a81
...@@ -21,7 +21,6 @@ ...@@ -21,7 +21,6 @@
#include "ui/views/background.h" #include "ui/views/background.h"
#include "ui/views/controls/focusable_border.h" #include "ui/views/controls/focusable_border.h"
#include "ui/views/controls/menu/menu_item_view.h" #include "ui/views/controls/menu/menu_item_view.h"
#include "ui/views/controls/menu/menu_model_adapter.h"
#include "ui/views/controls/menu/menu_runner.h" #include "ui/views/controls/menu/menu_runner.h"
#include "ui/views/controls/native/native_view_host.h" #include "ui/views/controls/native/native_view_host.h"
#include "ui/views/controls/textfield/textfield_controller.h" #include "ui/views/controls/textfield/textfield_controller.h"
...@@ -1423,8 +1422,8 @@ void Textfield::UpdateContextMenu() { ...@@ -1423,8 +1422,8 @@ void Textfield::UpdateContextMenu() {
IDS_APP_SELECT_ALL); IDS_APP_SELECT_ALL);
if (controller_) if (controller_)
controller_->UpdateContextMenu(context_menu_contents_.get()); 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()));
} }
void Textfield::TrackMouseClicks(const ui::MouseEvent& event) { void Textfield::TrackMouseClicks(const ui::MouseEvent& event) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment