Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(368)

Unified Diff: views/controls/menu/native_menu_x.h

Issue 7464027: Wayland support for views. views_desktop on Wayland. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Updated native_widget_wayland.cc to match compositor changes Created 9 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « views/controls/menu/native_menu_linux.cc ('k') | views/controls/menu/native_menu_x.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: views/controls/menu/native_menu_x.h
diff --git a/views/controls/menu/native_menu_x.h b/views/controls/menu/native_menu_x.h
deleted file mode 100644
index 34ae8944e7c6042efd8c55eed1350325ac46940d..0000000000000000000000000000000000000000
--- a/views/controls/menu/native_menu_x.h
+++ /dev/null
@@ -1,59 +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.
-
-#ifndef VIEWS_CONTROLS_MENU_NATIVE_MENU_X_H_
-#define VIEWS_CONTROLS_MENU_NATIVE_MENU_X_H_
-#pragma once
-
-#include "views/controls/menu/menu_delegate.h"
-#include "views/controls/menu/menu_item_view.h"
-#include "views/controls/menu/menu_wrapper.h"
-
-namespace ui {
-class MenuModel;
-}
-
-namespace views {
-
-class MenuRunner;
-
-// A non-GTK implementation of MenuWrapper, used currently for touchui.
-class NativeMenuX : public MenuWrapper,
- public MenuDelegate {
- public:
- explicit NativeMenuX(Menu2* menu);
- virtual ~NativeMenuX();
-
- // Overridden from MenuWrapper:
- virtual void RunMenuAt(const gfx::Point& point, int alignment);
- virtual void CancelMenu();
- virtual void Rebuild();
- virtual void UpdateStates();
- virtual gfx::NativeMenu GetNativeMenu() const;
- virtual MenuAction GetMenuAction() const;
- virtual void AddMenuListener(MenuListener* listener);
- virtual void RemoveMenuListener(MenuListener* listener);
- virtual void SetMinimumWidth(int width);
-
- // Overridden from MenuDelegate:
- virtual bool IsItemChecked(int id) const;
- virtual bool IsCommandEnabled(int id) const;
- virtual void ExecuteCommand(int id);
- virtual bool GetAccelerator(int id, views::Accelerator* accelerator);
-
- private:
- void AddMenuItemsFromModel(MenuItemView* parent, ui::MenuModel* model);
- void UpdateMenuFromModel(SubmenuView* menu, ui::MenuModel* model);
-
- // The attached model and delegate. Does not assume ownership.
- ui::MenuModel* model_;
- MenuItemView* root_;
- scoped_ptr<MenuRunner> menu_runner_;
-
- DISALLOW_COPY_AND_ASSIGN(NativeMenuX);
-};
-
-} // namespace views
-
-#endif // VIEWS_CONTROLS_MENU_NATIVE_MENU_X_H_
« no previous file with comments | « views/controls/menu/native_menu_linux.cc ('k') | views/controls/menu/native_menu_x.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698