| Index: chrome/browser/ui/views/toolbar/wrench_menu.h
|
| diff --git a/chrome/browser/ui/views/toolbar/wrench_menu.h b/chrome/browser/ui/views/toolbar/wrench_menu.h
|
| index ac3c51b4cd7844d82b435ebc36d7248351534782..267f1deb9f4e4527e01984cc97f94573562aab6d 100644
|
| --- a/chrome/browser/ui/views/toolbar/wrench_menu.h
|
| +++ b/chrome/browser/ui/views/toolbar/wrench_menu.h
|
| @@ -43,7 +43,7 @@ class WrenchMenu : public views::MenuDelegate,
|
| };
|
|
|
| WrenchMenu(Browser* browser, int run_flags);
|
| - virtual ~WrenchMenu();
|
| + ~WrenchMenu() override;
|
|
|
| void Init(ui::MenuModel* model);
|
|
|
| @@ -62,51 +62,51 @@ class WrenchMenu : public views::MenuDelegate,
|
| void RemoveObserver(WrenchMenuObserver* observer);
|
|
|
| // MenuDelegate overrides:
|
| - virtual const gfx::FontList* GetLabelFontList(int command_id) const override;
|
| - virtual bool GetShouldUseDisabledEmphasizedForegroundColor(
|
| + const gfx::FontList* GetLabelFontList(int command_id) const override;
|
| + bool GetShouldUseDisabledEmphasizedForegroundColor(
|
| int command_id) const override;
|
| - virtual base::string16 GetTooltipText(int command_id,
|
| - const gfx::Point& p) const override;
|
| - virtual bool IsTriggerableEvent(views::MenuItemView* menu,
|
| - const ui::Event& e) override;
|
| - virtual bool GetDropFormats(
|
| + base::string16 GetTooltipText(int command_id,
|
| + const gfx::Point& p) const override;
|
| + bool IsTriggerableEvent(views::MenuItemView* menu,
|
| + 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 command_id,
|
| - const gfx::Point& p,
|
| - ui::MenuSourceType source_type) 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 int GetMaxWidthForMenu(views::MenuItemView* menu) override;
|
| - virtual bool IsItemChecked(int command_id) const override;
|
| - virtual bool IsCommandEnabled(int command_id) const override;
|
| - virtual void ExecuteCommand(int command_id, int mouse_event_flags) override;
|
| - virtual bool GetAccelerator(int command_id,
|
| - ui::Accelerator* accelerator) const override;
|
| - virtual void WillShowMenu(views::MenuItemView* menu) override;
|
| - virtual void WillHideMenu(views::MenuItemView* menu) override;
|
| - virtual bool ShouldCloseOnDragComplete() 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 command_id,
|
| + const gfx::Point& p,
|
| + ui::MenuSourceType source_type) override;
|
| + bool CanDrag(views::MenuItemView* menu) override;
|
| + void WriteDragData(views::MenuItemView* sender,
|
| + ui::OSExchangeData* data) override;
|
| + int GetDragOperations(views::MenuItemView* sender) override;
|
| + int GetMaxWidthForMenu(views::MenuItemView* menu) override;
|
| + bool IsItemChecked(int command_id) const override;
|
| + bool IsCommandEnabled(int command_id) const override;
|
| + void ExecuteCommand(int command_id, int mouse_event_flags) override;
|
| + bool GetAccelerator(int command_id,
|
| + ui::Accelerator* accelerator) const override;
|
| + void WillShowMenu(views::MenuItemView* menu) override;
|
| + void WillHideMenu(views::MenuItemView* menu) override;
|
| + bool ShouldCloseOnDragComplete() override;
|
|
|
| // BaseBookmarkModelObserver overrides:
|
| - virtual void BookmarkModelChanged() override;
|
| + void BookmarkModelChanged() override;
|
|
|
| // content::NotificationObserver overrides:
|
| - virtual void Observe(int type,
|
| - const content::NotificationSource& source,
|
| - const content::NotificationDetails& details) override;
|
| + void Observe(int type,
|
| + const content::NotificationSource& source,
|
| + const content::NotificationDetails& details) override;
|
|
|
| private:
|
| class CutCopyPasteView;
|
|
|