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

Unified Diff: ui/app_list/app_list_folder_item.h

Issue 667923002: Standardize usage of virtual/override/final in ui/ (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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/accessibility/platform/ax_platform_node_mac.h ('k') | ui/app_list/app_list_folder_item.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/app_list/app_list_folder_item.h
diff --git a/ui/app_list/app_list_folder_item.h b/ui/app_list/app_list_folder_item.h
index bfcb86ec30f02aab922112190515ab1947b0515c..9b51d4b78775ab046f58197d0ce435ceeb35abb1 100644
--- a/ui/app_list/app_list_folder_item.h
+++ b/ui/app_list/app_list_folder_item.h
@@ -36,7 +36,7 @@ class APP_LIST_EXPORT AppListFolderItem : public AppListItem,
static const char kItemType[];
AppListFolderItem(const std::string& id, FolderType folder_type);
- virtual ~AppListFolderItem();
+ ~AppListFolderItem() override;
// Updates the folder's icon.
void UpdateIcon();
@@ -59,13 +59,13 @@ class APP_LIST_EXPORT AppListFolderItem : public AppListItem,
FolderType folder_type() const { return folder_type_; }
// AppListItem
- virtual void Activate(int event_flags) override;
- virtual const char* GetItemType() const override;
- virtual ui::MenuModel* GetContextMenuModel() override;
- virtual AppListItem* FindChildItem(const std::string& id) override;
- virtual size_t ChildItemCount() const override;
- virtual void OnExtensionPreferenceChanged() override;
- virtual bool CompareForTest(const AppListItem* other) const override;
+ void Activate(int event_flags) override;
+ const char* GetItemType() const override;
+ ui::MenuModel* GetContextMenuModel() override;
+ AppListItem* FindChildItem(const std::string& id) override;
+ size_t ChildItemCount() const override;
+ void OnExtensionPreferenceChanged() override;
+ bool CompareForTest(const AppListItem* other) const override;
// Calculates the top item icons' bounds inside |folder_icon_bounds|.
// Returns the bounds of top item icons in sequence of top left, top right,
@@ -77,15 +77,15 @@ class APP_LIST_EXPORT AppListFolderItem : public AppListItem,
private:
// AppListItemObserver
- virtual void ItemIconChanged() override;
+ void ItemIconChanged() override;
// AppListItemListObserver
- virtual void OnListItemAdded(size_t index, AppListItem* item) override;
- virtual void OnListItemRemoved(size_t index,
- AppListItem* item) override;;
- virtual void OnListItemMoved(size_t from_index,
- size_t to_index,
- AppListItem* item) override;
+ void OnListItemAdded(size_t index, AppListItem* item) override;
+ void OnListItemRemoved(size_t index, AppListItem* item) override;
+ ;
+ void OnListItemMoved(size_t from_index,
+ size_t to_index,
+ AppListItem* item) override;
void UpdateTopItems();
« no previous file with comments | « ui/accessibility/platform/ax_platform_node_mac.h ('k') | ui/app_list/app_list_folder_item.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698