Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / ui / views / controls / menu / menu_model_adapter.h

diff --git a/src/ui/views/controls/menu/menu_model_adapter.h b/src/ui/views/controls/menu/menu_model_adapter.h
index 353d010..5fc9d3e 100644 (file)
--- a/src/ui/views/controls/menu/menu_model_adapter.h
+++ b/src/ui/views/controls/menu/menu_model_adapter.h
@@ -23,7 +23,7 @@ class VIEWS_EXPORT MenuModelAdapter : public MenuDelegate {
   // The caller retains ownership of the ui::MenuModel instance and
   // must ensure it exists for the lifetime of the adapter.
   explicit MenuModelAdapter(ui::MenuModel* menu_model);
-  virtual ~MenuModelAdapter();
+  ~MenuModelAdapter() override;
 
   // Populate a MenuItemView menu with the ui::MenuModel items
   // (including submenus).
@@ -62,20 +62,18 @@ class VIEWS_EXPORT MenuModelAdapter : public MenuDelegate {
                                        int index);
 
   // views::MenuDelegate implementation.
-  virtual void ExecuteCommand(int id) OVERRIDE;
-  virtual void ExecuteCommand(int id, int mouse_event_flags) OVERRIDE;
-  virtual bool IsTriggerableEvent(MenuItemView* source,
-                                  const ui::Event& e) OVERRIDE;
-  virtual bool GetAccelerator(int id,
-                              ui::Accelerator* accelerator) const OVERRIDE;
-  virtual base::string16 GetLabel(int id) const OVERRIDE;
-  virtual const gfx::FontList* GetLabelFontList(int id) const OVERRIDE;
-  virtual bool IsCommandEnabled(int id) const OVERRIDE;
-  virtual bool IsCommandVisible(int id) const OVERRIDE;
-  virtual bool IsItemChecked(int id) const OVERRIDE;
-  virtual void SelectionChanged(MenuItemView* menu) OVERRIDE;
-  virtual void WillShowMenu(MenuItemView* menu) OVERRIDE;
-  virtual void WillHideMenu(MenuItemView* menu) OVERRIDE;
+  void ExecuteCommand(int id) override;
+  void ExecuteCommand(int id, int mouse_event_flags) override;
+  bool IsTriggerableEvent(MenuItemView* source, const ui::Event& e) override;
+  bool GetAccelerator(int id, ui::Accelerator* accelerator) const override;
+  base::string16 GetLabel(int id) const override;
+  const gfx::FontList* GetLabelFontList(int id) const override;
+  bool IsCommandEnabled(int id) const override;
+  bool IsCommandVisible(int id) const override;
+  bool IsItemChecked(int id) const override;
+  void SelectionChanged(MenuItemView* menu) override;
+  void WillShowMenu(MenuItemView* menu) override;
+  void WillHideMenu(MenuItemView* menu) override;
 
  private:
   // Implementation of BuildMenu().