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

Unified Diff: ash/system/tray/system_tray.h

Issue 621133002: replace OVERRIDE and FINAL with override and final in ash/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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 | « ash/system/tray/special_popup_row.h ('k') | ash/system/tray/system_tray_bubble.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/system/tray/system_tray.h
diff --git a/ash/system/tray/system_tray.h b/ash/system/tray/system_tray.h
index 301ef130d95be17130a2372d5fba68a82e1213c9..957e9abe716b2c0184ddab857362fd0291b6434f 100644
--- a/ash/system/tray/system_tray.h
+++ b/ash/system/tray/system_tray.h
@@ -123,24 +123,24 @@ class ASH_EXPORT SystemTray : public TrayBackgroundView,
bool CloseNotificationBubbleForTest() const;
// Overridden from TrayBackgroundView.
- virtual void SetShelfAlignment(ShelfAlignment alignment) OVERRIDE;
- virtual void AnchorUpdated() OVERRIDE;
- virtual base::string16 GetAccessibleNameForTray() OVERRIDE;
- virtual void BubbleResized(const views::TrayBubbleView* bubble_view) OVERRIDE;
+ virtual void SetShelfAlignment(ShelfAlignment alignment) override;
+ virtual void AnchorUpdated() override;
+ virtual base::string16 GetAccessibleNameForTray() override;
+ virtual void BubbleResized(const views::TrayBubbleView* bubble_view) override;
virtual void HideBubbleWithView(
- const views::TrayBubbleView* bubble_view) OVERRIDE;
- virtual bool ClickedOutsideBubble() OVERRIDE;
+ const views::TrayBubbleView* bubble_view) override;
+ virtual bool ClickedOutsideBubble() override;
// Overridden from message_center::TrayBubbleView::Delegate.
- virtual void BubbleViewDestroyed() OVERRIDE;
- virtual void OnMouseEnteredView() OVERRIDE;
- virtual void OnMouseExitedView() OVERRIDE;
- virtual base::string16 GetAccessibleNameForBubble() OVERRIDE;
+ virtual void BubbleViewDestroyed() override;
+ virtual void OnMouseEnteredView() override;
+ virtual void OnMouseExitedView() override;
+ virtual base::string16 GetAccessibleNameForBubble() override;
virtual gfx::Rect GetAnchorRect(
views::Widget* anchor_widget,
AnchorType anchor_type,
- AnchorAlignment anchor_alignment) const OVERRIDE;
- virtual void HideBubble(const views::TrayBubbleView* bubble_view) OVERRIDE;
+ AnchorAlignment anchor_alignment) const override;
+ virtual void HideBubble(const views::TrayBubbleView* bubble_view) override;
ScreenTrayItem* GetScreenShareItem() { return screen_share_tray_item_; }
ScreenTrayItem* GetScreenCaptureItem() { return screen_capture_tray_item_; }
@@ -202,7 +202,7 @@ class ASH_EXPORT SystemTray : public TrayBackgroundView,
const ScopedVector<SystemTrayItem>& items() const { return items_; }
// Overridden from ActionableView.
- virtual bool PerformAction(const ui::Event& event) OVERRIDE;
+ virtual bool PerformAction(const ui::Event& event) override;
// Owned items.
ScopedVector<SystemTrayItem> items_;
« no previous file with comments | « ash/system/tray/special_popup_row.h ('k') | ash/system/tray/system_tray_bubble.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698