| Index: chrome/browser/ui/views/bookmarks/bookmark_menu_controller_views.h
|
| diff --git a/chrome/browser/ui/views/bookmarks/bookmark_menu_controller_views.h b/chrome/browser/ui/views/bookmarks/bookmark_menu_controller_views.h
|
| index 9c7f07e4b104df957ca555ef4c070452257d3c14..fa8dbafff0b6493d23837ec64f69b3f6ea91ede6 100644
|
| --- a/chrome/browser/ui/views/bookmarks/bookmark_menu_controller_views.h
|
| +++ b/chrome/browser/ui/views/bookmarks/bookmark_menu_controller_views.h
|
| @@ -75,50 +75,47 @@ class BookmarkMenuController : public BaseBookmarkModelObserver,
|
| }
|
|
|
| // views::MenuDelegate:
|
| - virtual base::string16 GetTooltipText(int id,
|
| - const gfx::Point& p) const override;
|
| - virtual bool IsTriggerableEvent(views::MenuItemView* view,
|
| - const ui::Event& e) override;
|
| - virtual void ExecuteCommand(int id, int mouse_event_flags) override;
|
| - virtual bool ShouldExecuteCommandWithoutClosingMenu(
|
| - int id,
|
| - const ui::Event& e) override;
|
| - virtual bool GetDropFormats(
|
| + base::string16 GetTooltipText(int id, const gfx::Point& p) const override;
|
| + bool IsTriggerableEvent(views::MenuItemView* view,
|
| + const ui::Event& e) override;
|
| + void ExecuteCommand(int id, int mouse_event_flags) override;
|
| + bool ShouldExecuteCommandWithoutClosingMenu(int id,
|
| + const ui::Event& e) override;
|
| + bool GetDropFormats(
|
| views::MenuItemView* menu,
|
| int* formats,
|
| std::set<ui::OSExchangeData::CustomFormat>* custom_formats) override;
|
| - virtual bool AreDropTypesRequired(views::MenuItemView* menu) override;
|
| - virtual bool CanDrop(views::MenuItemView* menu,
|
| - const ui::OSExchangeData& data) override;
|
| - virtual int GetDropOperation(views::MenuItemView* item,
|
| - const ui::DropTargetEvent& event,
|
| - DropPosition* position) override;
|
| - virtual int OnPerformDrop(views::MenuItemView* menu,
|
| - DropPosition position,
|
| - const ui::DropTargetEvent& event) override;
|
| - virtual bool ShowContextMenu(views::MenuItemView* source,
|
| - int id,
|
| - const gfx::Point& p,
|
| - ui::MenuSourceType source_type) override;
|
| - virtual void DropMenuClosed(views::MenuItemView* menu) override;
|
| - virtual bool CanDrag(views::MenuItemView* menu) override;
|
| - virtual void WriteDragData(views::MenuItemView* sender,
|
| - ui::OSExchangeData* data) override;
|
| - virtual int GetDragOperations(views::MenuItemView* sender) override;
|
| - virtual views::MenuItemView* GetSiblingMenu(
|
| - views::MenuItemView* menu,
|
| - const gfx::Point& screen_point,
|
| - views::MenuAnchorPosition* anchor,
|
| - bool* has_mnemonics,
|
| - views::MenuButton** button) override;
|
| - virtual int GetMaxWidthForMenu(views::MenuItemView* view) override;
|
| + bool AreDropTypesRequired(views::MenuItemView* menu) override;
|
| + bool CanDrop(views::MenuItemView* menu,
|
| + const ui::OSExchangeData& data) override;
|
| + int GetDropOperation(views::MenuItemView* item,
|
| + const ui::DropTargetEvent& event,
|
| + DropPosition* position) override;
|
| + int OnPerformDrop(views::MenuItemView* menu,
|
| + DropPosition position,
|
| + const ui::DropTargetEvent& event) override;
|
| + bool ShowContextMenu(views::MenuItemView* source,
|
| + int id,
|
| + const gfx::Point& p,
|
| + ui::MenuSourceType source_type) override;
|
| + void DropMenuClosed(views::MenuItemView* menu) override;
|
| + bool CanDrag(views::MenuItemView* menu) override;
|
| + void WriteDragData(views::MenuItemView* sender,
|
| + ui::OSExchangeData* data) override;
|
| + int GetDragOperations(views::MenuItemView* sender) override;
|
| + views::MenuItemView* GetSiblingMenu(views::MenuItemView* menu,
|
| + const gfx::Point& screen_point,
|
| + views::MenuAnchorPosition* anchor,
|
| + bool* has_mnemonics,
|
| + views::MenuButton** button) override;
|
| + int GetMaxWidthForMenu(views::MenuItemView* view) override;
|
|
|
| // BaseBookmarkModelObserver:
|
| - virtual void BookmarkModelChanged() override;
|
| + void BookmarkModelChanged() override;
|
|
|
| private:
|
| // BookmarkMenuController deletes itself as necessary.
|
| - virtual ~BookmarkMenuController();
|
| + ~BookmarkMenuController() override;
|
|
|
| scoped_ptr<views::MenuRunner> menu_runner_;
|
|
|
|
|