diff options
| author | jennyz@chromium.org <jennyz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-16 20:53:38 +0000 |
|---|---|---|
| committer | jennyz@chromium.org <jennyz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-16 20:53:38 +0000 |
| commit | f3b95bbfabeb58c10a5b1ad69b4c953f0abf65a3 (patch) | |
| tree | 04301a7027fd46bca96f3c7fa08f5b2c412b22c6 /ui | |
| parent | 47d131129d7cc312be2904659967b26e47899d7e (diff) | |
| download | chromium_src-f3b95bbfabeb58c10a5b1ad69b4c953f0abf65a3.zip chromium_src-f3b95bbfabeb58c10a5b1ad69b4c953f0abf65a3.tar.gz chromium_src-f3b95bbfabeb58c10a5b1ad69b4c953f0abf65a3.tar.bz2 | |
Fix the issue that omnibox is editable when menu is opened in aura.
BUG=106950
TEST=omnibox is not editable when wrench menu is opened.
Review URL: http://codereview.chromium.org/8965013
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@114853 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/views/controls/menu/menu_controller.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/ui/views/controls/menu/menu_controller.cc b/ui/views/controls/menu/menu_controller.cc index f0c1cc1..4188a77 100644 --- a/ui/views/controls/menu/menu_controller.cc +++ b/ui/views/controls/menu/menu_controller.cc @@ -889,13 +889,13 @@ base::MessagePumpDispatcher::DispatchStatus } switch (ui::EventTypeFromNative(xev)) { case ui::ET_KEY_PRESSED: - OnKeyDown(ui::KeyboardCodeFromNative(xev)); - // OnKeyDown may have set exit_type_. - if (exit_type_ != EXIT_NONE) + if (!OnKeyDown(ui::KeyboardCodeFromNative(xev))) return base::MessagePumpDispatcher::EVENT_QUIT; - // TODO(oshima): support SelectChar - break; + // TODO(oshima): support SelectChar. + // See http://crbug.com/107869. + + return base::MessagePumpDispatcher::EVENT_PROCESSED; case ui::ET_KEY_RELEASED: return base::MessagePumpDispatcher::EVENT_PROCESSED; default: |