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

Unified Diff: ui/app_list/views/app_list_folder_view.h

Issue 623293004: replace OVERRIDE and FINAL with override and final in ui/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase on master 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/app_list/views/app_list_background.h ('k') | ui/app_list/views/app_list_item_view.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/app_list/views/app_list_folder_view.h
diff --git a/ui/app_list/views/app_list_folder_view.h b/ui/app_list/views/app_list_folder_view.h
index 2692578f6ad3bcdd229f03557d45ddefd48c98b7..58a25fb2edc1b59d0b77b866401dd31f1be9f845 100644
--- a/ui/app_list/views/app_list_folder_view.h
+++ b/ui/app_list/views/app_list_folder_view.h
@@ -58,15 +58,15 @@ class AppListFolderView : public views::View,
void CloseFolderPage();
// views::View
- virtual gfx::Size GetPreferredSize() const OVERRIDE;
- virtual void Layout() OVERRIDE;
- virtual bool OnKeyPressed(const ui::KeyEvent& event) OVERRIDE;
+ virtual gfx::Size GetPreferredSize() const override;
+ virtual void Layout() override;
+ virtual bool OnKeyPressed(const ui::KeyEvent& event) override;
// AppListModelObserver
- virtual void OnAppListItemWillBeDeleted(AppListItem* item) OVERRIDE;
+ virtual void OnAppListItemWillBeDeleted(AppListItem* item) override;
// ui::ImplicitAnimationObserver
- virtual void OnImplicitAnimationsCompleted() OVERRIDE;
+ virtual void OnImplicitAnimationsCompleted() override;
AppsGridView* items_grid_view() { return items_grid_view_; }
@@ -81,29 +81,29 @@ class AppListFolderView : public views::View,
const gfx::Point& drag_point_in_root_grid);
// Overridden from views::View:
- virtual void GetAccessibleState(ui::AXViewState* state) OVERRIDE;
+ virtual void GetAccessibleState(ui::AXViewState* state) override;
// Overridden from FolderHeaderViewDelegate:
virtual void NavigateBack(AppListFolderItem* item,
- const ui::Event& event_flags) OVERRIDE;
- virtual void GiveBackFocusToSearchBox() OVERRIDE;
+ const ui::Event& event_flags) override;
+ virtual void GiveBackFocusToSearchBox() override;
virtual void SetItemName(AppListFolderItem* item,
- const std::string& name) OVERRIDE;
+ const std::string& name) override;
// Overridden from AppsGridViewFolderDelegate:
- virtual void UpdateFolderViewBackground(bool show_bubble) OVERRIDE;
+ virtual void UpdateFolderViewBackground(bool show_bubble) override;
virtual void ReparentItem(AppListItemView* original_drag_view,
const gfx::Point& drag_point_in_folder_grid)
- OVERRIDE;
+ override;
virtual void DispatchDragEventForReparent(
AppsGridView::Pointer pointer,
- const gfx::Point& drag_point_in_folder_grid) OVERRIDE;
+ const gfx::Point& drag_point_in_folder_grid) override;
virtual void DispatchEndDragEventForReparent(
bool events_forwarded_to_drag_drop_host,
- bool cancel_drag) OVERRIDE;
- virtual bool IsPointOutsideOfFolderBoundary(const gfx::Point& point) OVERRIDE;
- virtual bool IsOEMFolder() const OVERRIDE;
- virtual void SetRootLevelDragViewVisible(bool visible) OVERRIDE;
+ bool cancel_drag) override;
+ virtual bool IsPointOutsideOfFolderBoundary(const gfx::Point& point) override;
+ virtual bool IsOEMFolder() const override;
+ virtual void SetRootLevelDragViewVisible(bool visible) override;
AppsContainerView* container_view_; // Not owned.
AppListMainView* app_list_main_view_; // Not Owned.
« no previous file with comments | « ui/app_list/views/app_list_background.h ('k') | ui/app_list/views/app_list_item_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698