Wayland support for views. views_desktop on Wayland.

views/controls/menu/native_menu_x.cc

Index: views/controls/menu/native_menu_x.cc
diff --git a/views/controls/menu/native_menu_x.cc b/views/controls/menu/native_menu_x.cc
deleted file mode 100644
index b07389e4a3ffb56f117a6db941e1a6d5dd10b335..0000000000000000000000000000000000000000
--- a/views/controls/menu/native_menu_x.cc
+++ /dev/null
@@ -1,168 +0,0 @@
-// 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))),
-      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();
-  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())
-    submenu->RemoveAllChildViews(true);
-  AddMenuItemsFromModel(root_, model_);
-}
-
-void NativeMenuX::UpdateStates() {
-  SubmenuView* submenu = root_->CreateSubmenu();
-  UpdateMenuFromModel(submenu, model_);
-}
-
-gfx::NativeMenu NativeMenuX::GetNativeMenu() const {
-  NOTIMPLEMENTED();
-  return NULL;
-}
-
-MenuWrapper::MenuAction NativeMenuX::GetMenuAction() const {
-  NOTIMPLEMENTED();
-  return MENU_ACTION_NONE;
-}
-
-void NativeMenuX::AddMenuListener(MenuListener* listener) {
-  NOTIMPLEMENTED();
-}
-
-void NativeMenuX::RemoveMenuListener(MenuListener* listener) {
-  NOTIMPLEMENTED();
-}
-
-void NativeMenuX::SetMinimumWidth(int width) {
-  NOTIMPLEMENTED();
-}
-
-// MenuDelegate implementation
-
-bool NativeMenuX::IsItemChecked(int cmd) const {
-  int index;
-  ui::MenuModel* model = model_;
-  if (!ui::MenuModel::GetModelAndIndexForCommandId(cmd, &model, &index))
-    return false;
-  return model->IsItemCheckedAt(index);
-}
-
-bool NativeMenuX::IsCommandEnabled(int cmd) const {
-  int index;
-  ui::MenuModel* model = model_;
-  if (!ui::MenuModel::GetModelAndIndexForCommandId(cmd, &model, &index))
-    return false;
-  return model->IsEnabledAt(index);
-}
-
-void NativeMenuX::ExecuteCommand(int cmd) {
-  int index;
-  ui::MenuModel* model = model_;
-  if (!ui::MenuModel::GetModelAndIndexForCommandId(cmd, &model, &index))
-    return;
-  model->ActivatedAt(index);
-}
-
-bool NativeMenuX::GetAccelerator(int id, views::Accelerator* accelerator) {
-  int index;
-  ui::MenuModel* model = model_;
-  if (!ui::MenuModel::GetModelAndIndexForCommandId(id, &model, &index))
-    return false;
-
-  ui::Accelerator menu_accelerator;
-  if (!model->GetAcceleratorAt(index, &menu_accelerator))
-    return false;
-
-  *accelerator = views::Accelerator(menu_accelerator.key_code(),
-                                    menu_accelerator.modifiers());
-  return true;
-}
-
-// private
-void NativeMenuX::AddMenuItemsFromModel(MenuItemView* parent,
-                                        ui::MenuModel* model) {
-  for (int i = 0; i < model->GetItemCount(); ++i) {
-    int index = i + model->GetFirstItemIndex(NULL);
-    MenuItemView* child = parent->AppendMenuItemFromModel(model, index,
-        model->GetCommandIdAt(index));
-
-    if (child && child->GetType() == MenuItemView::SUBMENU) {
-      AddMenuItemsFromModel(child, model->GetSubmenuModelAt(index));
-    }
-  }
-}
-
-void NativeMenuX::UpdateMenuFromModel(SubmenuView* menu,
-                                      ui::MenuModel* model) {
-  for (int i = 0, sep = 0; i < model->GetItemCount(); ++i) {
-    int index = i + model->GetFirstItemIndex(NULL);
-    if (model->GetTypeAt(index) == ui::MenuModel::TYPE_SEPARATOR) {
-      ++sep;
-      continue;
-    }
-
-    // The submenu excludes the separators when counting the menu-items
-    // in it. So exclude the number of separators to get the correct index.
-    MenuItemView* mitem = menu->GetMenuItemAt(index - sep);
-    mitem->SetVisible(model->IsVisibleAt(index));
-    mitem->SetEnabled(model->IsEnabledAt(index));
-    if (model->IsItemDynamicAt(index)) {
-      mitem->SetTitle(UTF16ToWide(model->GetLabelAt(index)));
-    }
-
-    SkBitmap icon;
-    if (model->GetIconAt(index, &icon)) {
-      // TODO(atwilson): Support removing the icon dynamically
-      // (http://crbug.com/66508).
-      mitem->SetIcon(icon);
-    }
-
-    if (model->GetTypeAt(index) == ui::MenuModel::TYPE_SUBMENU) {
-      DCHECK(mitem->HasSubmenu());
-      UpdateMenuFromModel(mitem->GetSubmenu(), model->GetSubmenuModelAt(index));
-    }
-  }
-}
-
-// MenuWrapper, public:
-
-// static
-MenuWrapper* MenuWrapper::CreateWrapper(Menu2* menu) {
-  return new NativeMenuX(menu);
-}
-
-}  // namespace views