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

Unified Diff: ui/app_list/views/app_list_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_main_view_unittest.cc ('k') | ui/app_list/views/app_list_view.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/app_list/views/app_list_view.h
diff --git a/ui/app_list/views/app_list_view.h b/ui/app_list/views/app_list_view.h
index 0ee715a42c4a95ae834f1d93978dfe065a1d08fe..c9cd5cf3e47dd7c0d120ccda1c1f6a4e0c7e021d 100644
--- a/ui/app_list/views/app_list_view.h
+++ b/ui/app_list/views/app_list_view.h
@@ -90,17 +90,17 @@ class APP_LIST_EXPORT AppListView : public views::BubbleDelegateView,
bool ShouldCenterWindow() const;
// Overridden from views::View:
- virtual gfx::Size GetPreferredSize() const OVERRIDE;
+ virtual gfx::Size GetPreferredSize() const override;
virtual void Paint(gfx::Canvas* canvas,
- const views::CullSet& cull_set) OVERRIDE;
- virtual void OnThemeChanged() OVERRIDE;
+ const views::CullSet& cull_set) override;
+ virtual void OnThemeChanged() override;
// WidgetDelegate overrides:
- virtual bool ShouldHandleSystemCommands() const OVERRIDE;
+ virtual bool ShouldHandleSystemCommands() const override;
// Overridden from AppListViewDelegateObserver:
- virtual void OnProfilesChanged() OVERRIDE;
- virtual void OnShutdown() OVERRIDE;
+ virtual void OnProfilesChanged() override;
+ virtual void OnShutdown() override;
void Prerender();
@@ -133,29 +133,29 @@ class APP_LIST_EXPORT AppListView : public views::BubbleDelegateView,
// Overridden from views::BubbleDelegateView:
virtual void OnBeforeBubbleWidgetInit(
views::Widget::InitParams* params,
- views::Widget* widget) const OVERRIDE;
+ views::Widget* widget) const override;
// Overridden from views::WidgetDelegateView:
- virtual views::View* GetInitiallyFocusedView() OVERRIDE;
- virtual gfx::ImageSkia GetWindowIcon() OVERRIDE;
- virtual bool WidgetHasHitTestMask() const OVERRIDE;
- virtual void GetWidgetHitTestMask(gfx::Path* mask) const OVERRIDE;
+ virtual views::View* GetInitiallyFocusedView() override;
+ virtual gfx::ImageSkia GetWindowIcon() override;
+ virtual bool WidgetHasHitTestMask() const override;
+ virtual void GetWidgetHitTestMask(gfx::Path* mask) const override;
// Overridden from views::View:
- virtual bool AcceleratorPressed(const ui::Accelerator& accelerator) OVERRIDE;
- virtual void Layout() OVERRIDE;
- virtual void SchedulePaintInRect(const gfx::Rect& rect) OVERRIDE;
+ virtual bool AcceleratorPressed(const ui::Accelerator& accelerator) override;
+ virtual void Layout() override;
+ virtual void SchedulePaintInRect(const gfx::Rect& rect) override;
// Overridden from views::WidgetObserver:
- virtual void OnWidgetDestroying(views::Widget* widget) OVERRIDE;
+ virtual void OnWidgetDestroying(views::Widget* widget) override;
virtual void OnWidgetVisibilityChanged(
- views::Widget* widget, bool visible) OVERRIDE;
+ views::Widget* widget, bool visible) override;
virtual void OnWidgetActivationChanged(
- views::Widget* widget, bool active) OVERRIDE;
+ views::Widget* widget, bool active) override;
// Overridden from SpeechUIModelObserver:
virtual void OnSpeechRecognitionStateChanged(
- SpeechRecognitionState new_state) OVERRIDE;
+ SpeechRecognitionState new_state) override;
AppListViewDelegate* delegate_; // Weak. Owned by AppListService.
« no previous file with comments | « ui/app_list/views/app_list_main_view_unittest.cc ('k') | ui/app_list/views/app_list_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698