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

Side by Side Diff: chrome/browser/ui/views/message_center/web_notification_tray_win.h

Issue 12667018: Switch Windows to use the MessagePopupCollection (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Better comments. Created 7 years, 9 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) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 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 CHROME_BROWSER_UI_VIEWS_MESSAGE_CENTER_WEB_NOTIFICATION_TRAY_WIN_H_ 5 #ifndef CHROME_BROWSER_UI_VIEWS_MESSAGE_CENTER_WEB_NOTIFICATION_TRAY_WIN_H_
6 #define CHROME_BROWSER_UI_VIEWS_MESSAGE_CENTER_WEB_NOTIFICATION_TRAY_WIN_H_ 6 #define CHROME_BROWSER_UI_VIEWS_MESSAGE_CENTER_WEB_NOTIFICATION_TRAY_WIN_H_
7 7
8 #include "chrome/browser/status_icons/status_icon_observer.h" 8 #include "chrome/browser/status_icons/status_icon_observer.h"
9 #include "ui/base/models/simple_menu_model.h" 9 #include "ui/base/models/simple_menu_model.h"
10 #include "ui/message_center/message_center_tray.h" 10 #include "ui/message_center/message_center_tray.h"
11 #include "ui/message_center/message_center_tray_delegate.h" 11 #include "ui/message_center/message_center_tray_delegate.h"
12 #include "ui/views/bubble/tray_bubble_view.h" 12 #include "ui/views/bubble/tray_bubble_view.h"
13 13
14 class StatusIcon; 14 class StatusIcon;
15 15
16 namespace message_center { 16 namespace message_center {
17 class MessageCenter; 17 class MessageCenter;
18 class MessageCenterBubble; 18 class MessageCenterBubble;
19 class MessagePopupBubble; 19 class MessagePopupCollection;
20 } 20 }
21 21
22 namespace views { 22 namespace views {
23 class Widget; 23 class Widget;
24 } 24 }
25 25
26 namespace message_center { 26 namespace message_center {
27 27
28 namespace internal { 28 namespace internal {
29 class NotificationBubbleWrapperWin; 29 class NotificationBubbleWrapperWin;
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
68 68
69 private: 69 private:
70 FRIEND_TEST_ALL_PREFIXES(WebNotificationTrayWinTest, WebNotifications); 70 FRIEND_TEST_ALL_PREFIXES(WebNotificationTrayWinTest, WebNotifications);
71 FRIEND_TEST_ALL_PREFIXES(WebNotificationTrayWinTest, 71 FRIEND_TEST_ALL_PREFIXES(WebNotificationTrayWinTest,
72 WebNotificationPopupBubble); 72 WebNotificationPopupBubble);
73 FRIEND_TEST_ALL_PREFIXES(WebNotificationTrayWinTest, 73 FRIEND_TEST_ALL_PREFIXES(WebNotificationTrayWinTest,
74 ManyMessageCenterNotifications); 74 ManyMessageCenterNotifications);
75 FRIEND_TEST_ALL_PREFIXES(WebNotificationTrayWinTest, ManyPopupNotifications); 75 FRIEND_TEST_ALL_PREFIXES(WebNotificationTrayWinTest, ManyPopupNotifications);
76 76
77 void AddQuietModeMenu(StatusIcon* status_icon); 77 void AddQuietModeMenu(StatusIcon* status_icon);
78 message_center::MessagePopupBubble* GetPopupBubbleForTest();
79 message_center::MessageCenterBubble* GetMessageCenterBubbleForTest(); 78 message_center::MessageCenterBubble* GetMessageCenterBubbleForTest();
80 79
81 scoped_ptr<internal::NotificationBubbleWrapperWin> popup_bubble_;
82 scoped_ptr<internal::NotificationBubbleWrapperWin> message_center_bubble_; 80 scoped_ptr<internal::NotificationBubbleWrapperWin> message_center_bubble_;
81 scoped_ptr<message_center::MessagePopupCollection> popup_collection_;
83 82
84 StatusIcon* status_icon_; 83 StatusIcon* status_icon_;
85 bool message_center_visible_; 84 bool message_center_visible_;
86 scoped_ptr<MessageCenterTray> message_center_tray_; 85 scoped_ptr<MessageCenterTray> message_center_tray_;
87 gfx::Point mouse_click_point_; 86 gfx::Point mouse_click_point_;
88 87
89 DISALLOW_COPY_AND_ASSIGN(WebNotificationTrayWin); 88 DISALLOW_COPY_AND_ASSIGN(WebNotificationTrayWin);
90 }; 89 };
91 90
92 } // namespace message_center 91 } // namespace message_center
93 92
94 #endif // CHROME_BROWSER_UI_VIEWS_MESSAGE_CENTER_WEB_NOTIFICATION_TRAY_WIN_H_ 93 #endif // CHROME_BROWSER_UI_VIEWS_MESSAGE_CENTER_WEB_NOTIFICATION_TRAY_WIN_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698