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

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

Issue 11819048: Implement message center on Windows (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Now with more tests, and corrected copyright notices. Created 7 years, 11 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/tray/tray_views.h"
11 #include "ash/system/user/login_status.h" 10 #include "ash/system/user/login_status.h"
12 #include "base/gtest_prod_util.h" 11 #include "base/gtest_prod_util.h"
13 #include "ui/message_center/message_center.h" 12 #include "base/memory/scoped_ptr.h"
13 #include "ui/message_center/message_center_tray.h"
14 #include "ui/views/bubble/tray_bubble_view.h"
14 #include "ui/views/widget/widget_observer.h" 15 #include "ui/views/widget/widget_observer.h"
15 16
16 // Status area tray for showing browser and app notifications. This hosts 17 // Status area tray for showing browser and app notifications. This hosts
17 // a MessageCenter class which manages the notification list. This class 18 // a MessageCenter class which manages the notification list. This class
18 // contains the Ash specific tray implementation. 19 // contains the Ash specific tray implementation.
19 // 20 //
20 // Note: These are not related to system notifications (i.e NotificationView 21 // Note: These are not related to system notifications (i.e NotificationView
21 // generated by SystemTrayItem). Visibility of one notification type or other 22 // generated by SystemTrayItem). Visibility of one notification type or other
22 // is controlled by StatusAreaWidget. 23 // is controlled by StatusAreaWidget.
23 24
24 namespace aura {
25 class LocatedEvent;
26 }
27
28 namespace gfx {
29 class ImageSkia;
30 }
31
32 namespace views {
33 class ImageButton;
34 class TrayBubbleView;
35 class Widget;
36 }
37
38 namespace message_center { 25 namespace message_center {
26 class MessageBubbleBase;
27 class MessageCenter;
39 class MessageCenterBubble; 28 class MessageCenterBubble;
40 class MessagePopupBubble; 29 class MessagePopupBubble;
41 class QuietModeBubble;
42 } 30 }
43 31
44 namespace ash { 32 namespace ash {
45 33
46 namespace internal { 34 namespace internal {
47 class StatusAreaWidget; 35 class StatusAreaWidget;
48 class WebNotificationBubbleWrapper; 36 class WebNotificationBubbleWrapper;
49 } 37 }
50 38
51 class ASH_EXPORT WebNotificationTray 39 class ASH_EXPORT WebNotificationTray
52 : public internal::TrayBackgroundView, 40 : public internal::TrayBackgroundView,
53 public views::TrayBubbleView::Delegate, 41 public views::TrayBubbleView::Delegate,
54 public message_center::MessageCenter::Observer, 42 public ui::MessageCenterTrayDelegate,
43 public ui::MessageCenterTrayObserver,
55 public views::ButtonListener, 44 public views::ButtonListener,
56 public views::WidgetObserver { 45 public views::WidgetObserver {
57 public: 46 public:
58 explicit WebNotificationTray(internal::StatusAreaWidget* status_area_widget); 47 explicit WebNotificationTray(
48 internal::StatusAreaWidget* status_area_widget);
59 virtual ~WebNotificationTray(); 49 virtual ~WebNotificationTray();
60 50
61 // Set whether or not the popup notifications should be hidden. 51 // Set whether or not the popup notifications should be hidden.
62 void SetHidePopupBubble(bool hide); 52 void SetHidePopupBubble(bool hide);
63 53
64 // Updates tray visibility login status of the system changes. 54 // Updates tray visibility login status of the system changes.
65 void UpdateAfterLoginStatusChange(user::LoginStatus login_status); 55 void UpdateAfterLoginStatusChange(user::LoginStatus login_status);
66 56
67 // Returns true if it should block the auto hide behavior of the launcher. 57 // Returns true if it should block the auto hide behavior of the launcher.
68 bool ShouldBlockLauncherAutoHide() const; 58 bool ShouldBlockLauncherAutoHide() const;
69 59
70 // Returns true if the message center bubble is visible. 60 // Returns true if the message center bubble is visible.
71 bool IsMessageCenterBubbleVisible() const; 61 bool IsMessageCenterBubbleVisible() const;
72 62
73 // Returns true if the mouse is inside the notification bubble. 63 // Returns true if the mouse is inside the notification bubble.
74 bool IsMouseInNotificationBubble() const; 64 bool IsMouseInNotificationBubble() const;
75 65
76 message_center::MessageCenter* message_center() { 66 virtual message_center::MessageCenter* message_center();
77 return message_center_;
78 }
79 67
80 // Overridden from TrayBackgroundView. 68 // Overridden from TrayBackgroundView.
81 virtual void SetShelfAlignment(ShelfAlignment alignment) OVERRIDE; 69 virtual void SetShelfAlignment(ShelfAlignment alignment) OVERRIDE;
82 virtual void AnchorUpdated() OVERRIDE; 70 virtual void AnchorUpdated() OVERRIDE;
83 virtual string16 GetAccessibleNameForTray() OVERRIDE; 71 virtual string16 GetAccessibleNameForTray() OVERRIDE;
84 virtual void HideBubbleWithView( 72 virtual void HideBubbleWithView(
85 const views::TrayBubbleView* bubble_view) OVERRIDE; 73 const views::TrayBubbleView* bubble_view) OVERRIDE;
86 virtual bool ClickedOutsideBubble() OVERRIDE; 74 virtual bool ClickedOutsideBubble() OVERRIDE;
87 75
88 // Overridden from internal::ActionableView. 76 // Overridden from internal::ActionableView.
89 virtual bool PerformAction(const ui::Event& event) OVERRIDE; 77 virtual bool PerformAction(const ui::Event& event) OVERRIDE;
90 78
79
80 // Tells the tray to show the MessageCenter bubble.
81 void ShowMessageCenter();
82
91 // Overridden from views::TrayBubbleView::Delegate. 83 // Overridden from views::TrayBubbleView::Delegate.
92 virtual void BubbleViewDestroyed() OVERRIDE; 84 virtual void BubbleViewDestroyed() OVERRIDE;
93 virtual void OnMouseEnteredView() OVERRIDE; 85 virtual void OnMouseEnteredView() OVERRIDE;
94 virtual void OnMouseExitedView() OVERRIDE; 86 virtual void OnMouseExitedView() OVERRIDE;
95 virtual string16 GetAccessibleNameForBubble() OVERRIDE; 87 virtual string16 GetAccessibleNameForBubble() OVERRIDE;
96 virtual gfx::Rect GetAnchorRect(views::Widget* anchor_widget, 88 virtual gfx::Rect GetAnchorRect(views::Widget* anchor_widget,
97 AnchorType anchor_type, 89 AnchorType anchor_type,
98 AnchorAlignment anchor_alignment) OVERRIDE; 90 AnchorAlignment anchor_alignment) OVERRIDE;
99 virtual void HideBubble(const views::TrayBubbleView* bubble_view) OVERRIDE; 91 virtual void HideBubble(const views::TrayBubbleView* bubble_view) OVERRIDE;
100 92
101 // Overridden from message_center::MessageCenter::Observer. 93 // Overridden from MessageCenterTrayObserver.
102 virtual void OnMessageCenterChanged(bool new_notification) OVERRIDE; 94 virtual void OnMessageCenterTrayChanged() OVERRIDE;
103 95
104 // Overridden from ButtonListener. 96 // Overridden from ButtonListener.
105 virtual void ButtonPressed(views::Button* sender, 97 virtual void ButtonPressed(views::Button* sender,
106 const ui::Event& event) OVERRIDE; 98 const ui::Event& event) OVERRIDE;
107 99
108 // Overridden from WidgetObserver. 100 // Overridden from WidgetObserver.
109 virtual void OnWidgetClosing(views::Widget* widget) OVERRIDE; 101 virtual void OnWidgetClosing(views::Widget* widget) OVERRIDE;
110 102
103
104
111 private: 105 private:
112 FRIEND_TEST_ALL_PREFIXES(WebNotificationTrayTest, WebNotifications); 106 FRIEND_TEST_ALL_PREFIXES(WebNotificationTrayTest, WebNotifications);
113 FRIEND_TEST_ALL_PREFIXES(WebNotificationTrayTest, WebNotificationPopupBubble); 107 FRIEND_TEST_ALL_PREFIXES(WebNotificationTrayTest, WebNotificationPopupBubble);
114 FRIEND_TEST_ALL_PREFIXES(WebNotificationTrayTest, 108 FRIEND_TEST_ALL_PREFIXES(WebNotificationTrayTest,
115 ManyMessageCenterNotifications); 109 ManyMessageCenterNotifications);
116 FRIEND_TEST_ALL_PREFIXES(WebNotificationTrayTest, ManyPopupNotifications); 110 FRIEND_TEST_ALL_PREFIXES(WebNotificationTrayTest, ManyPopupNotifications);
117 111
118 // Shows or hides the message center bubble. 112 public:
119 void ToggleMessageCenterBubble(); 113 // TODO(dewittj): move these up above the private area after merging trunk.
114 // MessageCenterTrayDelegate implementation.
115 virtual bool ShowMessageCenter(
116 message_center::MessageBubbleBase* bubble) OVERRIDE;
117 virtual void UpdateMessageCenter() OVERRIDE;
118 virtual void HideMessageCenter() OVERRIDE;
119 virtual bool ShowPopups (
120 message_center::MessageBubbleBase* bubble) OVERRIDE;
121 virtual void UpdatePopups() OVERRIDE;
122 virtual void HidePopups() OVERRIDE;
120 123
121 // Shows or updates the message center bubble and hides the popup bubble. 124 private:
122 void ShowMessageCenterBubble(); 125 // Queries login status and the status area widget to determine visibility of
126 // the message center.
127 bool ShouldShowMessageCenter();
123 128
124 // Hides the message center bubble if visible. 129 // Returns true if it should show the quiet mode bubble.
125 void HideMessageCenterBubble();
126
127 // Shows or updates the popup notification bubble if appropriate.
128 void ShowPopupBubble();
129
130 // Hides the notification bubble if visible.
131 void HidePopupBubble();
132
133 // Returns true if it should show the quiet mode bubble.
134 bool ShouldShowQuietModeBubble(const ui::Event& event); 130 bool ShouldShowQuietModeBubble(const ui::Event& event);
135 131
136 // Shows the quiet mode bubble. 132 // Shows the quiet mode bubble.
137 void ShowQuietModeBubble(); 133 void ShowQuietModeBubble();
138 134
139 // Updates the tray icon and visibility.
140 void UpdateTray();
141 135
142 internal::WebNotificationBubbleWrapper* message_center_bubble() const { 136 internal::WebNotificationBubbleWrapper* message_center_bubble() const {
143 return message_center_bubble_.get(); 137 return message_center_bubble_.get();
144 } 138 }
145 139
146 internal::WebNotificationBubbleWrapper* popup_bubble() const { 140 internal::WebNotificationBubbleWrapper* popup_bubble() const {
147 return popup_bubble_.get(); 141 return popup_bubble_.get();
148 } 142 }
149 143
150 message_center::QuietModeBubble* quiet_mode_bubble() const { 144 message_center::QuietModeBubble* quiet_mode_bubble() const {
151 return quiet_mode_bubble_.get(); 145 return quiet_mode_bubble_.get();
152 } 146 }
153 147
154 // Testing accessors. 148 // Testing accessors.
149 bool IsPopupVisible() const;
155 message_center::MessageCenterBubble* GetMessageCenterBubbleForTest(); 150 message_center::MessageCenterBubble* GetMessageCenterBubbleForTest();
156 message_center::MessagePopupBubble* GetPopupBubbleForTest(); 151 message_center::MessagePopupBubble* GetPopupBubbleForTest();
157 152
158 message_center::MessageCenter* message_center_; 153 scoped_ptr<ui::MessageCenterTray> message_center_tray_;
159 scoped_ptr<internal::WebNotificationBubbleWrapper> message_center_bubble_; 154 scoped_ptr<internal::WebNotificationBubbleWrapper> message_center_bubble_;
160 scoped_ptr<internal::WebNotificationBubbleWrapper> popup_bubble_; 155 scoped_ptr<internal::WebNotificationBubbleWrapper> popup_bubble_;
161 scoped_ptr<message_center::QuietModeBubble> quiet_mode_bubble_; 156 scoped_ptr<message_center::QuietModeBubble> quiet_mode_bubble_;
162 views::ImageButton* button_; 157 views::ImageButton* button_;
158
163 bool show_message_center_on_unlock_; 159 bool show_message_center_on_unlock_;
164 160
165 DISALLOW_COPY_AND_ASSIGN(WebNotificationTray); 161 DISALLOW_COPY_AND_ASSIGN(WebNotificationTray);
166 }; 162 };
167 163
168 } // namespace ash 164 } // namespace ash
169 165
170 #endif // ASH_SYSTEM_WEB_NOTIFICATION_WEB_NOTIFICATION_TRAY_H_ 166 #endif // ASH_SYSTEM_WEB_NOTIFICATION_WEB_NOTIFICATION_TRAY_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698