Fixes the touch build from patch @ 98179

views/controls/menu/native_menu_x.cc

 // 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.
 
 #include "views/controls/menu/native_menu_x.h"
 
 #include "base/logging.h"
 #include "base/utf_string_conversions.h"
 #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() {
 }
 
 // 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() {
   NOTIMPLEMENTED();
 }
 
 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() {
   SubmenuView* submenu = root_->CreateSubmenu();
   UpdateMenuFromModel(submenu, model_);
 }
 
 gfx::NativeMenu NativeMenuX::GetNativeMenu() const {
   NOTIMPLEMENTED();
   return NULL;
@@ skipping 104 matching lines @@
 }
 
 // MenuWrapper, public:
 
 // static
 MenuWrapper* MenuWrapper::CreateWrapper(Menu2* menu) {
   return new NativeMenuX(menu);
 }
 
 }  // namespace views