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

Side by Side Diff: ash/system/web_notification/web_notification_tray.h

Issue 2948223002: Revert of Do not activate TrayBubbleView by default (Closed)
Patch Set: Created 3 years, 6 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 <memory> 8 #include <memory>
9 9
10 #include "ash/ash_export.h" 10 #include "ash/ash_export.h"
(...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after
84 void HideBubbleWithView(const views::TrayBubbleView* bubble_view) override; 84 void HideBubbleWithView(const views::TrayBubbleView* bubble_view) override;
85 void ClickedOutsideBubble() override; 85 void ClickedOutsideBubble() override;
86 86
87 // Overridden from ActionableView. 87 // Overridden from ActionableView.
88 bool PerformAction(const ui::Event& event) override; 88 bool PerformAction(const ui::Event& event) override;
89 89
90 // Overridden from views::TrayBubbleView::Delegate. 90 // Overridden from views::TrayBubbleView::Delegate.
91 void BubbleViewDestroyed() override; 91 void BubbleViewDestroyed() override;
92 void OnMouseEnteredView() override; 92 void OnMouseEnteredView() override;
93 void OnMouseExitedView() override; 93 void OnMouseExitedView() override;
94 void RegisterAccelerators(const std::vector<ui::Accelerator>& accelerators,
95 views::TrayBubbleView* tray_bubble_view) override;
96 void UnregisterAllAccelerators(
97 views::TrayBubbleView* tray_bubble_view) override;
98 base::string16 GetAccessibleNameForBubble() override; 94 base::string16 GetAccessibleNameForBubble() override;
99 bool ShouldEnableExtraKeyboardAccessibility() override;
100 void HideBubble(const views::TrayBubbleView* bubble_view) override; 95 void HideBubble(const views::TrayBubbleView* bubble_view) override;
101 96
102 // Overridden from MessageCenterTrayDelegate. 97 // Overridden from MessageCenterTrayDelegate.
103 void OnMessageCenterTrayChanged() override; 98 void OnMessageCenterTrayChanged() override;
104 bool ShowMessageCenter() override; 99 bool ShowMessageCenter() override;
105 void HideMessageCenter() override; 100 void HideMessageCenter() override;
106 bool ShowPopups() override; 101 bool ShowPopups() override;
107 void HidePopups() override; 102 void HidePopups() override;
108 bool ShowNotifierSettings() override; 103 bool ShowNotifierSettings() override;
109 bool IsContextMenuEnabled() const override; 104 bool IsContextMenuEnabled() const override;
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after
180 bool should_block_shelf_auto_hide_; 175 bool should_block_shelf_auto_hide_;
181 176
182 std::unique_ptr<AshPopupAlignmentDelegate> popup_alignment_delegate_; 177 std::unique_ptr<AshPopupAlignmentDelegate> popup_alignment_delegate_;
183 178
184 DISALLOW_COPY_AND_ASSIGN(WebNotificationTray); 179 DISALLOW_COPY_AND_ASSIGN(WebNotificationTray);
185 }; 180 };
186 181
187 } // namespace ash 182 } // namespace ash
188 183
189 #endif // ASH_SYSTEM_WEB_NOTIFICATION_WEB_NOTIFICATION_TRAY_H_ 184 #endif // ASH_SYSTEM_WEB_NOTIFICATION_WEB_NOTIFICATION_TRAY_H_
OLDNEW
« no previous file with comments | « ash/system/tray/system_tray_bubble.cc ('k') | ash/system/web_notification/web_notification_tray.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698