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

Side by Side Diff: ash/system/web_notification/web_notification_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 unified diff | Download patch
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 ASH_SYSTEM_WEB_NOTIFICATION_WEB_NOTIFICATION_TRAY_H_ 5 #ifndef ASH_SYSTEM_WEB_NOTIFICATION_WEB_NOTIFICATION_TRAY_H_
6 #define ASH_SYSTEM_WEB_NOTIFICATION_WEB_NOTIFICATION_TRAY_H_ 6 #define ASH_SYSTEM_WEB_NOTIFICATION_WEB_NOTIFICATION_TRAY_H_
7 7
8 #include "ash/ash_export.h" 8 #include "ash/ash_export.h"
9 #include "ash/system/tray/tray_background_view.h" 9 #include "ash/system/tray/tray_background_view.h"
10 #include "ash/system/user/login_status.h" 10 #include "ash/system/user/login_status.h"
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
68 // Returns true if the mouse is inside the notification bubble. 68 // Returns true if the mouse is inside the notification bubble.
69 bool IsMouseInNotificationBubble() const; 69 bool IsMouseInNotificationBubble() const;
70 70
71 // Shows the message center bubble. 71 // Shows the message center bubble.
72 void ShowMessageCenterBubble(); 72 void ShowMessageCenterBubble();
73 73
74 // Called when the login status is changed. 74 // Called when the login status is changed.
75 void UpdateAfterLoginStatusChange(user::LoginStatus login_status); 75 void UpdateAfterLoginStatusChange(user::LoginStatus login_status);
76 76
77 // Overridden from TrayBackgroundView. 77 // Overridden from TrayBackgroundView.
78 virtual void SetShelfAlignment(ShelfAlignment alignment) OVERRIDE; 78 virtual void SetShelfAlignment(ShelfAlignment alignment) override;
79 virtual void AnchorUpdated() OVERRIDE; 79 virtual void AnchorUpdated() override;
80 virtual base::string16 GetAccessibleNameForTray() OVERRIDE; 80 virtual base::string16 GetAccessibleNameForTray() override;
81 virtual void HideBubbleWithView( 81 virtual void HideBubbleWithView(
82 const views::TrayBubbleView* bubble_view) OVERRIDE; 82 const views::TrayBubbleView* bubble_view) override;
83 virtual bool ClickedOutsideBubble() OVERRIDE; 83 virtual bool ClickedOutsideBubble() override;
84 84
85 // Overridden from ActionableView. 85 // Overridden from ActionableView.
86 virtual bool PerformAction(const ui::Event& event) OVERRIDE; 86 virtual bool PerformAction(const ui::Event& event) override;
87 87
88 // Overridden from views::TrayBubbleView::Delegate. 88 // Overridden from views::TrayBubbleView::Delegate.
89 virtual void BubbleViewDestroyed() OVERRIDE; 89 virtual void BubbleViewDestroyed() override;
90 virtual void OnMouseEnteredView() OVERRIDE; 90 virtual void OnMouseEnteredView() override;
91 virtual void OnMouseExitedView() OVERRIDE; 91 virtual void OnMouseExitedView() override;
92 virtual base::string16 GetAccessibleNameForBubble() OVERRIDE; 92 virtual base::string16 GetAccessibleNameForBubble() override;
93 virtual gfx::Rect GetAnchorRect( 93 virtual gfx::Rect GetAnchorRect(
94 views::Widget* anchor_widget, 94 views::Widget* anchor_widget,
95 AnchorType anchor_type, 95 AnchorType anchor_type,
96 AnchorAlignment anchor_alignment) const OVERRIDE; 96 AnchorAlignment anchor_alignment) const override;
97 virtual void HideBubble(const views::TrayBubbleView* bubble_view) OVERRIDE; 97 virtual void HideBubble(const views::TrayBubbleView* bubble_view) override;
98 98
99 // Overridden from ButtonListener. 99 // Overridden from ButtonListener.
100 virtual void ButtonPressed(views::Button* sender, 100 virtual void ButtonPressed(views::Button* sender,
101 const ui::Event& event) OVERRIDE; 101 const ui::Event& event) override;
102 102
103 // Overridden from MessageCenterTrayDelegate. 103 // Overridden from MessageCenterTrayDelegate.
104 virtual void OnMessageCenterTrayChanged() OVERRIDE; 104 virtual void OnMessageCenterTrayChanged() override;
105 virtual bool ShowMessageCenter() OVERRIDE; 105 virtual bool ShowMessageCenter() override;
106 virtual void HideMessageCenter() OVERRIDE; 106 virtual void HideMessageCenter() override;
107 virtual bool ShowPopups() OVERRIDE; 107 virtual bool ShowPopups() override;
108 virtual void HidePopups() OVERRIDE; 108 virtual void HidePopups() override;
109 virtual bool ShowNotifierSettings() OVERRIDE; 109 virtual bool ShowNotifierSettings() override;
110 virtual bool IsContextMenuEnabled() const OVERRIDE; 110 virtual bool IsContextMenuEnabled() const override;
111 virtual message_center::MessageCenterTray* GetMessageCenterTray() OVERRIDE; 111 virtual message_center::MessageCenterTray* GetMessageCenterTray() override;
112 112
113 // Overridden from SimpleMenuModel::Delegate. 113 // Overridden from SimpleMenuModel::Delegate.
114 virtual bool IsCommandIdChecked(int command_id) const OVERRIDE; 114 virtual bool IsCommandIdChecked(int command_id) const override;
115 virtual bool IsCommandIdEnabled(int command_id) const OVERRIDE; 115 virtual bool IsCommandIdEnabled(int command_id) const override;
116 virtual bool GetAcceleratorForCommandId( 116 virtual bool GetAcceleratorForCommandId(
117 int command_id, 117 int command_id,
118 ui::Accelerator* accelerator) OVERRIDE; 118 ui::Accelerator* accelerator) override;
119 virtual void ExecuteCommand(int command_id, int event_flags) OVERRIDE; 119 virtual void ExecuteCommand(int command_id, int event_flags) override;
120 120
121 message_center::MessageCenter* message_center() const; 121 message_center::MessageCenter* message_center() const;
122 122
123 private: 123 private:
124 friend class WebNotificationTrayTest; 124 friend class WebNotificationTrayTest;
125 125
126 FRIEND_TEST_ALL_PREFIXES(WebNotificationTrayTest, WebNotifications); 126 FRIEND_TEST_ALL_PREFIXES(WebNotificationTrayTest, WebNotifications);
127 FRIEND_TEST_ALL_PREFIXES(WebNotificationTrayTest, WebNotificationPopupBubble); 127 FRIEND_TEST_ALL_PREFIXES(WebNotificationTrayTest, WebNotificationPopupBubble);
128 FRIEND_TEST_ALL_PREFIXES(WebNotificationTrayTest, 128 FRIEND_TEST_ALL_PREFIXES(WebNotificationTrayTest,
129 ManyMessageCenterNotifications); 129 ManyMessageCenterNotifications);
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
176 bool should_block_shelf_auto_hide_; 176 bool should_block_shelf_auto_hide_;
177 177
178 scoped_ptr<AshPopupAlignmentDelegate> popup_alignment_delegate_; 178 scoped_ptr<AshPopupAlignmentDelegate> popup_alignment_delegate_;
179 179
180 DISALLOW_COPY_AND_ASSIGN(WebNotificationTray); 180 DISALLOW_COPY_AND_ASSIGN(WebNotificationTray);
181 }; 181 };
182 182
183 } // namespace ash 183 } // namespace ash
184 184
185 #endif // ASH_SYSTEM_WEB_NOTIFICATION_WEB_NOTIFICATION_TRAY_H_ 185 #endif // ASH_SYSTEM_WEB_NOTIFICATION_WEB_NOTIFICATION_TRAY_H_
OLDNEW
« no previous file with comments | « ash/system/web_notification/ash_popup_alignment_delegate.h ('k') | ash/system/web_notification/web_notification_tray.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698