A non-GTK version of menus for touchui.

chrome/browser/chromeos/views/native_menu_domui.cc

 // Copyright (c) 2010 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 "chrome/browser/chromeos/views/native_menu_domui.h"
 
 #include <string>
 
 #include "app/menus/menu_model.h"
 #include "base/message_loop.h"
 #include "base/string_util.h"
 #include "chrome/browser/chromeos/dom_ui/menu_ui.h"
 #include "chrome/browser/chromeos/views/domui_menu_widget.h"
 #include "chrome/browser/chromeos/views/menu_locator.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/common/url_constants.h"
 #include "gfx/rect.h"
 #include "views/controls/menu/menu_2.h"
-#include "views/controls/menu/native_menu_gtk.h"
 #include "views/controls/menu/nested_dispatcher_gtk.h"
 
 #if defined(TOUCH_UI)
 #include "views/focus/accelerator_handler.h"
+#include "views/controls/menu/native_menu_x.h"
+#else
+#include "views/controls/menu/native_menu_gtk.h"
 #endif
 
 namespace {
 
 using chromeos::NativeMenuDOMUI;
 using chromeos::DOMUIMenuWidget;
 
 // Returns true if the menu item type specified can be executed as a command.
 bool MenuTypeCanExecute(menus::MenuModel::ItemType type) {
   return type == menus::MenuModel::TYPE_COMMAND ||
@@ skipping 205 matching lines @@
       break;
     }
     default:
       break;
   }
   gtk_main_do_event(event);
   return true;
 }
 
 #if defined(TOUCH_UI)
-bool NativeMenuDOMUI::Dispatch(XEvent* xevent) {
-  return views::DispatchXEvent(xevent);
+base::MessagePumpGlibXDispatcher::DispatchStatus NativeMenuDOMUI::Dispatch(
+    XEvent* xevent) {
+  return views::DispatchXEvent(xevent) ?
+      base::MessagePumpGlibXDispatcher::EVENT_PROCESSED :
+      base::MessagePumpGlibXDispatcher::EVENT_IGNORED;
+
 }
 #endif
 
 ////////////////////////////////////////////////////////////////////////////////
 // NativeMenuDOMUI, MenuControl implementation:
 
 void NativeMenuDOMUI::Activate(menus::MenuModel* model,
                                int index,
                                ActivationMode activation) {
   NativeMenuDOMUI* root = GetRoot();
@@ skipping 135 matching lines @@
 // MenuWrapper, public:
 
 namespace views {
 
 // static
 MenuWrapper* MenuWrapper::CreateWrapper(Menu2* menu) {
   menus::MenuModel* model = menu->model();
   if (chromeos::MenuUI::IsEnabled()) {
     return new chromeos::NativeMenuDOMUI(model, true);
   } else {
+#if defined(TOUCH_UI)
+    return new NativeMenuX(menu);
+#else
     return new NativeMenuGtk(menu);
+#endif
   }
 }
 
 }  // namespace views