| Index: ui/message_center/views/toast_contents_view.h
|
| diff --git a/ui/message_center/views/toast_contents_view.h b/ui/message_center/views/toast_contents_view.h
|
| index 4ebcd1736b5fec023b60049e133e23780d8fb7e3..7f4c7492a7d9ef3bb8ed400fd281e0a910ce63d7 100644
|
| --- a/ui/message_center/views/toast_contents_view.h
|
| +++ b/ui/message_center/views/toast_contents_view.h
|
| @@ -43,7 +43,7 @@ class ToastContentsView : public views::WidgetDelegateView,
|
|
|
| ToastContentsView(const std::string& notification_id,
|
| base::WeakPtr<MessagePopupCollection> collection);
|
| - virtual ~ToastContentsView();
|
| + ~ToastContentsView() override;
|
|
|
| // Sets the inner view of the toast. If it has contents already,
|
| // |a11y_feedback_for_updates| causes the view to notify that the
|
| @@ -71,34 +71,34 @@ class ToastContentsView : public views::WidgetDelegateView,
|
| const std::string& id() { return id_; }
|
|
|
| // Overridden from views::View:
|
| - virtual void OnMouseEntered(const ui::MouseEvent& event) override;
|
| - virtual void OnMouseExited(const ui::MouseEvent& event) override;
|
| - virtual void Layout() override;
|
| - virtual gfx::Size GetPreferredSize() const override;
|
| - virtual void GetAccessibleState(ui::AXViewState* state) override;
|
| + void OnMouseEntered(const ui::MouseEvent& event) override;
|
| + void OnMouseExited(const ui::MouseEvent& event) override;
|
| + void Layout() override;
|
| + gfx::Size GetPreferredSize() const override;
|
| + void GetAccessibleState(ui::AXViewState* state) override;
|
|
|
| private:
|
| // Overridden from MessageCenterController:
|
| - virtual void ClickOnNotification(const std::string& notification_id) override;
|
| - virtual void RemoveNotification(const std::string& notification_id,
|
| - bool by_user) override;
|
| - virtual scoped_ptr<ui::MenuModel> CreateMenuModel(
|
| + void ClickOnNotification(const std::string& notification_id) override;
|
| + void RemoveNotification(const std::string& notification_id,
|
| + bool by_user) override;
|
| + scoped_ptr<ui::MenuModel> CreateMenuModel(
|
| const NotifierId& notifier_id,
|
| const base::string16& display_source) override;
|
| - virtual bool HasClickedListener(const std::string& notification_id) override;
|
| - virtual void ClickOnNotificationButton(const std::string& notification_id,
|
| - int button_index) override;
|
| + bool HasClickedListener(const std::string& notification_id) override;
|
| + void ClickOnNotificationButton(const std::string& notification_id,
|
| + int button_index) override;
|
|
|
| // Overridden from gfx::AnimationDelegate:
|
| - virtual void AnimationProgressed(const gfx::Animation* animation) override;
|
| - virtual void AnimationEnded(const gfx::Animation* animation) override;
|
| - virtual void AnimationCanceled(const gfx::Animation* animation) override;
|
| + void AnimationProgressed(const gfx::Animation* animation) override;
|
| + void AnimationEnded(const gfx::Animation* animation) override;
|
| + void AnimationCanceled(const gfx::Animation* animation) override;
|
|
|
| // Overridden from views::WidgetDelegate:
|
| - virtual views::View* GetContentsView() override;
|
| - virtual void WindowClosing() override;
|
| - virtual void OnDisplayChanged() override;
|
| - virtual void OnWorkAreaChanged() override;
|
| + views::View* GetContentsView() override;
|
| + void WindowClosing() override;
|
| + void OnDisplayChanged() override;
|
| + void OnWorkAreaChanged() override;
|
|
|
| // Initialization and update.
|
| void CreateWidget(gfx::NativeView parent);
|
|
|