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

Side by Side Diff: chrome/browser/ui/views/bookmarks/bookmark_context_menu.h

Issue 628773002: replace OVERRIDE and FINAL with override and final in chrome/browser/ui/[t-v]* (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CHROME_BROWSER_UI_VIEWS_BOOKMARKS_BOOKMARK_CONTEXT_MENU_H_ 5 #ifndef CHROME_BROWSER_UI_VIEWS_BOOKMARKS_BOOKMARK_CONTEXT_MENU_H_
6 #define CHROME_BROWSER_UI_VIEWS_BOOKMARKS_BOOKMARK_CONTEXT_MENU_H_ 6 #define CHROME_BROWSER_UI_VIEWS_BOOKMARKS_BOOKMARK_CONTEXT_MENU_H_
7 7
8 #include "base/compiler_specific.h" 8 #include "base/compiler_specific.h"
9 #include "chrome/browser/ui/bookmarks/bookmark_context_menu_controller.h" 9 #include "chrome/browser/ui/bookmarks/bookmark_context_menu_controller.h"
10 #include "ui/views/controls/menu/menu_delegate.h" 10 #include "ui/views/controls/menu/menu_delegate.h"
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
51 views::MenuItemView* menu() const { return menu_; } 51 views::MenuItemView* menu() const { return menu_; }
52 52
53 void set_observer(BookmarkContextMenuObserver* observer) { 53 void set_observer(BookmarkContextMenuObserver* observer) {
54 observer_ = observer; 54 observer_ = observer;
55 } 55 }
56 56
57 // Sets the PageNavigator. 57 // Sets the PageNavigator.
58 void SetPageNavigator(content::PageNavigator* navigator); 58 void SetPageNavigator(content::PageNavigator* navigator);
59 59
60 // Overridden from views::MenuDelegate: 60 // Overridden from views::MenuDelegate:
61 virtual void ExecuteCommand(int command_id, int event_flags) OVERRIDE; 61 virtual void ExecuteCommand(int command_id, int event_flags) override;
62 virtual bool IsItemChecked(int command_id) const OVERRIDE; 62 virtual bool IsItemChecked(int command_id) const override;
63 virtual bool IsCommandEnabled(int command_id) const OVERRIDE; 63 virtual bool IsCommandEnabled(int command_id) const override;
64 virtual bool IsCommandVisible(int command_id) const OVERRIDE; 64 virtual bool IsCommandVisible(int command_id) const override;
65 virtual bool ShouldCloseAllMenusOnExecute(int id) OVERRIDE; 65 virtual bool ShouldCloseAllMenusOnExecute(int id) override;
66 66
67 // Overridden from BookmarkContextMenuControllerDelegate: 67 // Overridden from BookmarkContextMenuControllerDelegate:
68 virtual void CloseMenu() OVERRIDE; 68 virtual void CloseMenu() override;
69 virtual void WillExecuteCommand( 69 virtual void WillExecuteCommand(
70 int command_id, 70 int command_id,
71 const std::vector<const BookmarkNode*>& bookmarks) OVERRIDE; 71 const std::vector<const BookmarkNode*>& bookmarks) override;
72 virtual void DidExecuteCommand(int command_id) OVERRIDE; 72 virtual void DidExecuteCommand(int command_id) override;
73 73
74 private: 74 private:
75 scoped_ptr<BookmarkContextMenuController> controller_; 75 scoped_ptr<BookmarkContextMenuController> controller_;
76 76
77 // The parent of dialog boxes opened from the context menu. 77 // The parent of dialog boxes opened from the context menu.
78 views::Widget* parent_widget_; 78 views::Widget* parent_widget_;
79 79
80 // The menu itself. This is owned by |menu_runner_|. 80 // The menu itself. This is owned by |menu_runner_|.
81 views::MenuItemView* menu_; 81 views::MenuItemView* menu_;
82 82
83 // Responsible for running the menu. 83 // Responsible for running the menu.
84 scoped_ptr<views::MenuRunner> menu_runner_; 84 scoped_ptr<views::MenuRunner> menu_runner_;
85 85
86 BookmarkContextMenuObserver* observer_; 86 BookmarkContextMenuObserver* observer_;
87 87
88 // Should the menu close when a node is removed. 88 // Should the menu close when a node is removed.
89 bool close_on_remove_; 89 bool close_on_remove_;
90 90
91 DISALLOW_COPY_AND_ASSIGN(BookmarkContextMenu); 91 DISALLOW_COPY_AND_ASSIGN(BookmarkContextMenu);
92 }; 92 };
93 93
94 #endif // CHROME_BROWSER_UI_VIEWS_BOOKMARKS_BOOKMARK_CONTEXT_MENU_H_ 94 #endif // CHROME_BROWSER_UI_VIEWS_BOOKMARKS_BOOKMARK_CONTEXT_MENU_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698