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

Side by Side Diff: ui/views/widget/widget.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 unified diff | Download patch
« no previous file with comments | « ui/views/widget/tooltip_manager_aura.h ('k') | ui/views/widget/widget.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 UI_VIEWS_WIDGET_WIDGET_H_ 5 #ifndef UI_VIEWS_WIDGET_WIDGET_H_
6 #define UI_VIEWS_WIDGET_WIDGET_H_ 6 #define UI_VIEWS_WIDGET_WIDGET_H_
7 7
8 #include <set> 8 #include <set>
9 #include <stack> 9 #include <stack>
10 #include <vector> 10 #include <vector>
(...skipping 724 matching lines...) Expand 10 before | Expand all | Expand 10 after
735 // Called when the delegate's CanResize or CanMaximize changes. 735 // Called when the delegate's CanResize or CanMaximize changes.
736 void OnSizeConstraintsChanged(); 736 void OnSizeConstraintsChanged();
737 737
738 // Notification that our owner is closing. 738 // Notification that our owner is closing.
739 // NOTE: this is not invoked for aura as it's currently not needed there. 739 // NOTE: this is not invoked for aura as it's currently not needed there.
740 // Under aura menus close by way of activation getting reset when the owner 740 // Under aura menus close by way of activation getting reset when the owner
741 // closes. 741 // closes.
742 virtual void OnOwnerClosing(); 742 virtual void OnOwnerClosing();
743 743
744 // Overridden from NativeWidgetDelegate: 744 // Overridden from NativeWidgetDelegate:
745 virtual bool IsModal() const OVERRIDE; 745 virtual bool IsModal() const override;
746 virtual bool IsDialogBox() const OVERRIDE; 746 virtual bool IsDialogBox() const override;
747 virtual bool CanActivate() const OVERRIDE; 747 virtual bool CanActivate() const override;
748 virtual bool IsInactiveRenderingDisabled() const OVERRIDE; 748 virtual bool IsInactiveRenderingDisabled() const override;
749 virtual void EnableInactiveRendering() OVERRIDE; 749 virtual void EnableInactiveRendering() override;
750 virtual void OnNativeWidgetActivationChanged(bool active) OVERRIDE; 750 virtual void OnNativeWidgetActivationChanged(bool active) override;
751 virtual void OnNativeFocus(gfx::NativeView old_focused_view) OVERRIDE; 751 virtual void OnNativeFocus(gfx::NativeView old_focused_view) override;
752 virtual void OnNativeBlur(gfx::NativeView new_focused_view) OVERRIDE; 752 virtual void OnNativeBlur(gfx::NativeView new_focused_view) override;
753 virtual void OnNativeWidgetVisibilityChanging(bool visible) OVERRIDE; 753 virtual void OnNativeWidgetVisibilityChanging(bool visible) override;
754 virtual void OnNativeWidgetVisibilityChanged(bool visible) OVERRIDE; 754 virtual void OnNativeWidgetVisibilityChanged(bool visible) override;
755 virtual void OnNativeWidgetCreated(bool desktop_widget) OVERRIDE; 755 virtual void OnNativeWidgetCreated(bool desktop_widget) override;
756 virtual void OnNativeWidgetDestroying() OVERRIDE; 756 virtual void OnNativeWidgetDestroying() override;
757 virtual void OnNativeWidgetDestroyed() OVERRIDE; 757 virtual void OnNativeWidgetDestroyed() override;
758 virtual gfx::Size GetMinimumSize() const OVERRIDE; 758 virtual gfx::Size GetMinimumSize() const override;
759 virtual gfx::Size GetMaximumSize() const OVERRIDE; 759 virtual gfx::Size GetMaximumSize() const override;
760 virtual void OnNativeWidgetMove() OVERRIDE; 760 virtual void OnNativeWidgetMove() override;
761 virtual void OnNativeWidgetSizeChanged(const gfx::Size& new_size) OVERRIDE; 761 virtual void OnNativeWidgetSizeChanged(const gfx::Size& new_size) override;
762 virtual void OnNativeWidgetWindowShowStateChanged() OVERRIDE; 762 virtual void OnNativeWidgetWindowShowStateChanged() override;
763 virtual void OnNativeWidgetBeginUserBoundsChange() OVERRIDE; 763 virtual void OnNativeWidgetBeginUserBoundsChange() override;
764 virtual void OnNativeWidgetEndUserBoundsChange() OVERRIDE; 764 virtual void OnNativeWidgetEndUserBoundsChange() override;
765 virtual bool HasFocusManager() const OVERRIDE; 765 virtual bool HasFocusManager() const override;
766 virtual bool OnNativeWidgetPaintAccelerated( 766 virtual bool OnNativeWidgetPaintAccelerated(
767 const gfx::Rect& dirty_region) OVERRIDE; 767 const gfx::Rect& dirty_region) override;
768 virtual void OnNativeWidgetPaint(gfx::Canvas* canvas) OVERRIDE; 768 virtual void OnNativeWidgetPaint(gfx::Canvas* canvas) override;
769 virtual int GetNonClientComponent(const gfx::Point& point) OVERRIDE; 769 virtual int GetNonClientComponent(const gfx::Point& point) override;
770 virtual void OnKeyEvent(ui::KeyEvent* event) OVERRIDE; 770 virtual void OnKeyEvent(ui::KeyEvent* event) override;
771 virtual void OnMouseEvent(ui::MouseEvent* event) OVERRIDE; 771 virtual void OnMouseEvent(ui::MouseEvent* event) override;
772 virtual void OnMouseCaptureLost() OVERRIDE; 772 virtual void OnMouseCaptureLost() override;
773 virtual void OnScrollEvent(ui::ScrollEvent* event) OVERRIDE; 773 virtual void OnScrollEvent(ui::ScrollEvent* event) override;
774 virtual void OnGestureEvent(ui::GestureEvent* event) OVERRIDE; 774 virtual void OnGestureEvent(ui::GestureEvent* event) override;
775 virtual bool ExecuteCommand(int command_id) OVERRIDE; 775 virtual bool ExecuteCommand(int command_id) override;
776 virtual InputMethod* GetInputMethodDirect() OVERRIDE; 776 virtual InputMethod* GetInputMethodDirect() override;
777 virtual const std::vector<ui::Layer*>& GetRootLayers() OVERRIDE; 777 virtual const std::vector<ui::Layer*>& GetRootLayers() override;
778 virtual bool HasHitTestMask() const OVERRIDE; 778 virtual bool HasHitTestMask() const override;
779 virtual void GetHitTestMask(gfx::Path* mask) const OVERRIDE; 779 virtual void GetHitTestMask(gfx::Path* mask) const override;
780 virtual Widget* AsWidget() OVERRIDE; 780 virtual Widget* AsWidget() override;
781 virtual const Widget* AsWidget() const OVERRIDE; 781 virtual const Widget* AsWidget() const override;
782 virtual bool SetInitialFocus(ui::WindowShowState show_state) OVERRIDE; 782 virtual bool SetInitialFocus(ui::WindowShowState show_state) override;
783 783
784 // Overridden from ui::EventSource: 784 // Overridden from ui::EventSource:
785 virtual ui::EventProcessor* GetEventProcessor() OVERRIDE; 785 virtual ui::EventProcessor* GetEventProcessor() override;
786 786
787 // Overridden from FocusTraversable: 787 // Overridden from FocusTraversable:
788 virtual FocusSearch* GetFocusSearch() OVERRIDE; 788 virtual FocusSearch* GetFocusSearch() override;
789 virtual FocusTraversable* GetFocusTraversableParent() OVERRIDE; 789 virtual FocusTraversable* GetFocusTraversableParent() override;
790 virtual View* GetFocusTraversableParentView() OVERRIDE; 790 virtual View* GetFocusTraversableParentView() override;
791 791
792 // Overridden from ui::NativeThemeObserver: 792 // Overridden from ui::NativeThemeObserver:
793 virtual void OnNativeThemeUpdated(ui::NativeTheme* observed_theme) OVERRIDE; 793 virtual void OnNativeThemeUpdated(ui::NativeTheme* observed_theme) override;
794 794
795 protected: 795 protected:
796 // Creates the RootView to be used within this Widget. Subclasses may override 796 // Creates the RootView to be used within this Widget. Subclasses may override
797 // to create custom RootViews that do specialized event processing. 797 // to create custom RootViews that do specialized event processing.
798 // TODO(beng): Investigate whether or not this is needed. 798 // TODO(beng): Investigate whether or not this is needed.
799 virtual internal::RootView* CreateRootView(); 799 virtual internal::RootView* CreateRootView();
800 800
801 // Provided to allow the NativeWidget implementations to destroy the RootView 801 // Provided to allow the NativeWidget implementations to destroy the RootView
802 // _before_ the focus manager/tooltip manager. 802 // _before_ the focus manager/tooltip manager.
803 // TODO(beng): remove once we fold those objects onto this one. 803 // TODO(beng): remove once we fold those objects onto this one.
(...skipping 141 matching lines...) Expand 10 before | Expand all | Expand 10 after
945 bool movement_disabled_; 945 bool movement_disabled_;
946 946
947 ScopedObserver<ui::NativeTheme, ui::NativeThemeObserver> observer_manager_; 947 ScopedObserver<ui::NativeTheme, ui::NativeThemeObserver> observer_manager_;
948 948
949 DISALLOW_COPY_AND_ASSIGN(Widget); 949 DISALLOW_COPY_AND_ASSIGN(Widget);
950 }; 950 };
951 951
952 } // namespace views 952 } // namespace views
953 953
954 #endif // UI_VIEWS_WIDGET_WIDGET_H_ 954 #endif // UI_VIEWS_WIDGET_WIDGET_H_
OLDNEW
« no previous file with comments | « ui/views/widget/tooltip_manager_aura.h ('k') | ui/views/widget/widget.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698