Fixes the touch build from patch @ 98179. I missed a touch class using

MenuItemView.

BUG=57890
TEST=thorougly test all menus in chrome: bookmarks, wrench menu,
context menu on page, extension menus...
TBR=ben@chromium.org
R=ben@chromium.org

Review URL: http://codereview.chromium.org/7746012

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@98183 0039d316-1c4b-4281-b951-d872f2087c98

views/controls/menu/native_menu_x.cc

@@ -9,13 +9,15 @@
 #include "ui/gfx/canvas_skia.h"
 #include "ui/gfx/skia_util.h"
 #include "views/controls/menu/menu_2.h"
+#include "views/controls/menu/menu_runner.h"
 #include "views/controls/menu/submenu_view.h"
 
 namespace views {
 
 NativeMenuX::NativeMenuX(Menu2* menu)
     : model_(menu->model()),
-      ALLOW_THIS_IN_INITIALIZER_LIST(root_(new MenuItemView(this))) {
+      ALLOW_THIS_IN_INITIALIZER_LIST(root_(new MenuItemView(this))),
+      menu_runner_(new MenuRunner(root_)) {
 }
 
 NativeMenuX::~NativeMenuX() {
@@ -23,10 +25,13 @@ NativeMenuX::~NativeMenuX() {
 
 // MenuWrapper implementation:
 void NativeMenuX::RunMenuAt(const gfx::Point& point, int alignment) {
+  // TODO: this should really return the value from MenuRunner.
   UpdateStates();
-  root_->RunMenuAt(NULL, NULL, gfx::Rect(point, gfx::Size()),
-      alignment == Menu2::ALIGN_TOPLEFT ? MenuItemView::TOPLEFT :
-      MenuItemView::TOPRIGHT, true);
+  if (menu_runner_->RunMenuAt(NULL, NULL, gfx::Rect(point, gfx::Size()),
+          alignment == Menu2::ALIGN_TOPLEFT ? MenuItemView::TOPLEFT :
+          MenuItemView::TOPRIGHT, MenuRunner::HAS_MNEMONICS) ==
+      MenuRunner::MENU_DELETED)
+    return;
 }
 
 void NativeMenuX::CancelMenu() {
@@ -34,10 +39,9 @@ void NativeMenuX::CancelMenu() {
 }
 
 void NativeMenuX::Rebuild() {
-  if (SubmenuView* submenu = root_->GetSubmenu()) {
+  if (SubmenuView* submenu = root_->GetSubmenu())
     submenu->RemoveAllChildViews(true);
-  }
-  AddMenuItemsFromModel(root_.get(), model_);
+  AddMenuItemsFromModel(root_, model_);
 }
 
 void NativeMenuX::UpdateStates() {

views/controls/menu/native_menu_x.h

-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -16,6 +16,8 @@ class MenuModel;
 
 namespace views {
 
+class MenuRunner;
+
 // A non-GTK implementation of MenuWrapper, used currently for touchui.
 class NativeMenuX : public MenuWrapper,
                     public MenuDelegate {
@@ -46,7 +48,8 @@ class NativeMenuX : public MenuWrapper,
 
   // The attached model and delegate. Does not assume ownership.
   ui::MenuModel* model_;
-  scoped_ptr<MenuItemView> root_;
+  MenuItemView* root_;
+  scoped_ptr<MenuRunner> menu_runner_;
 
   DISALLOW_COPY_AND_ASSIGN(NativeMenuX);
 };