A non-GTK version of menus for touchui.

views/controls/menu/menu_item_view.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 "views/controls/menu/menu_item_view.h"
 
 #include "app/l10n_util.h"
+#include "app/menus/menu_model.h"
 #include "base/utf_string_conversions.h"
 #include "gfx/canvas.h"
 #include "grit/app_strings.h"
 #include "views/controls/button/text_button.h"
 #include "views/controls/button/menu_button.h"
 #include "views/controls/menu/menu_config.h"
 #include "views/controls/menu/menu_controller.h"
 #include "views/controls/menu/menu_separator.h"
 #include "views/controls/menu/submenu_view.h"
 
@@ skipping 212 matching lines @@
   controller_->Run(parent, NULL, this, bounds, anchor, NULL);
 }
 
 void MenuItemView::Cancel() {
   if (controller_ && !canceled_) {
     canceled_ = true;
     controller_->Cancel(MenuController::EXIT_ALL);
   }
 }
 
+MenuItemView* MenuItemView::AppendMenuItemFromModel(menus::MenuModel* model,
+                                                    int index, int id) {

[sky, 2010/11/22 19:23:01]

id should be on its own line.

[sadrul, 2010/11/22 19:42:38]

Done.

+  SkBitmap icon;
+  std::wstring label;
+  MenuItemView::Type type;
+  menus::MenuModel::ItemType menu_type = model->GetTypeAt(index);
+  switch (menu_type) {
+    case menus::MenuModel::TYPE_COMMAND:
+      model->GetIconAt(index, &icon);
+      type = MenuItemView::NORMAL;
+      label = UTF16ToWide(model->GetLabelAt(index));
+      break;
+    case menus::MenuModel::TYPE_CHECK:
+      type = MenuItemView::CHECKBOX;
+      label = UTF16ToWide(model->GetLabelAt(index));
+      break;
+    case menus::MenuModel::TYPE_RADIO:
+      type = MenuItemView::RADIO;
+      label = UTF16ToWide(model->GetLabelAt(index));
+      break;
+    case menus::MenuModel::TYPE_SEPARATOR:
+      type = MenuItemView::SEPARATOR;
+      break;
+    case menus::MenuModel::TYPE_SUBMENU:
+      type = MenuItemView::SUBMENU;
+      label = UTF16ToWide(model->GetLabelAt(index));
+      break;
+    default:
+      NOTREACHED();
+      type = MenuItemView::NORMAL;
+      break;
+  }
+
+  return AppendMenuItemImpl(id, label, icon, type);
+}
+
 MenuItemView* MenuItemView::AppendMenuItemImpl(int item_id,
                                                const std::wstring& label,
                                                const SkBitmap& icon,
                                                Type type) {
   if (!submenu_)
     CreateSubmenu();
   if (type == SEPARATOR) {
     submenu_->AddChildView(new MenuSeparator());
     return NULL;
   }
@@ skipping 368 matching lines @@
 }
 
 std::wstring MenuItemView::GetAcceleratorText() {
   Accelerator accelerator;
   return (GetDelegate() &&
           GetDelegate()->GetAccelerator(GetCommand(), &accelerator)) ?
       accelerator.GetShortcutText() : std::wstring();
 }
 
 }  // namespace views