Index: ui/views/bubble/tray_bubble_view.h |
diff --git a/ui/views/bubble/tray_bubble_view.h b/ui/views/bubble/tray_bubble_view.h |
index 8ffd58dafa2db514eb0a801b01897e3af7488cfc..4bcb7fe0e2532b2ec6d37b09cf7cd205c0da47f3 100644 |
--- a/ui/views/bubble/tray_bubble_view.h |
+++ b/ui/views/bubble/tray_bubble_view.h |
@@ -117,7 +117,7 @@ class VIEWS_EXPORT TrayBubbleView : public views::BubbleDelegateView, |
Delegate* delegate, |
InitParams* init_params); |
- virtual ~TrayBubbleView(); |
+ ~TrayBubbleView() override; |
// Sets up animations, and show the bubble. Must occur after CreateBubble() |
// is called. |
@@ -147,25 +147,25 @@ class VIEWS_EXPORT TrayBubbleView : public views::BubbleDelegateView, |
bool is_gesture_dragging() const { return is_gesture_dragging_; } |
// Overridden from views::WidgetDelegate. |
- virtual bool CanActivate() const override; |
- virtual views::NonClientFrameView* CreateNonClientFrameView( |
+ bool CanActivate() const override; |
+ views::NonClientFrameView* CreateNonClientFrameView( |
views::Widget* widget) override; |
- virtual bool WidgetHasHitTestMask() const override; |
- virtual void GetWidgetHitTestMask(gfx::Path* mask) const override; |
+ bool WidgetHasHitTestMask() const override; |
+ void GetWidgetHitTestMask(gfx::Path* mask) const override; |
// Overridden from views::BubbleDelegateView. |
- virtual gfx::Rect GetAnchorRect() const override; |
+ gfx::Rect GetAnchorRect() const override; |
// Overridden from views::View. |
- virtual gfx::Size GetPreferredSize() const override; |
- virtual gfx::Size GetMaximumSize() const override; |
- virtual int GetHeightForWidth(int width) const override; |
- virtual void OnMouseEntered(const ui::MouseEvent& event) override; |
- virtual void OnMouseExited(const ui::MouseEvent& event) override; |
- virtual void GetAccessibleState(ui::AXViewState* state) override; |
+ gfx::Size GetPreferredSize() const override; |
+ gfx::Size GetMaximumSize() const override; |
+ int GetHeightForWidth(int width) const override; |
+ void OnMouseEntered(const ui::MouseEvent& event) override; |
+ void OnMouseExited(const ui::MouseEvent& event) override; |
+ void GetAccessibleState(ui::AXViewState* state) override; |
// Overridden from MouseWatcherListener |
- virtual void MouseMovedOutOfHost() override; |
+ void MouseMovedOutOfHost() override; |
protected: |
TrayBubbleView(gfx::NativeView parent_window, |
@@ -174,11 +174,11 @@ class VIEWS_EXPORT TrayBubbleView : public views::BubbleDelegateView, |
const InitParams& init_params); |
// Overridden from views::BubbleDelegateView. |
- virtual void Init() override; |
+ void Init() override; |
// Overridden from views::View. |
- virtual void ChildPreferredSizeChanged(View* child) override; |
- virtual void ViewHierarchyChanged( |
+ void ChildPreferredSizeChanged(View* child) override; |
+ void ViewHierarchyChanged( |
const ViewHierarchyChangedDetails& details) override; |
private: |