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

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

Issue 14366014: Places the unread count in the middle of web notification tray button. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 8 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 | Annotate | Revision Log
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 23 matching lines...) Expand all
34 class MessageCenterBubble; 34 class MessageCenterBubble;
35 class MessagePopupBubble; 35 class MessagePopupBubble;
36 class MessagePopupCollection; 36 class MessagePopupCollection;
37 } 37 }
38 38
39 namespace ash { 39 namespace ash {
40 40
41 namespace internal { 41 namespace internal {
42 class StatusAreaWidget; 42 class StatusAreaWidget;
43 class WebNotificationBubbleWrapper; 43 class WebNotificationBubbleWrapper;
44 class WebNotificationButton;
44 } 45 }
45 46
46 class ASH_EXPORT WebNotificationTray 47 class ASH_EXPORT WebNotificationTray
47 : public internal::TrayBackgroundView, 48 : public internal::TrayBackgroundView,
48 public views::TrayBubbleView::Delegate, 49 public views::TrayBubbleView::Delegate,
49 public message_center::MessageCenterTrayDelegate, 50 public message_center::MessageCenterTrayDelegate,
50 public views::ButtonListener { 51 public views::ButtonListener {
51 public: 52 public:
52 explicit WebNotificationTray( 53 explicit WebNotificationTray(
53 internal::StatusAreaWidget* status_area_widget); 54 internal::StatusAreaWidget* status_area_widget);
(...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after
135 // Testing accessors. 136 // Testing accessors.
136 bool IsPopupVisible() const; 137 bool IsPopupVisible() const;
137 message_center::MessageCenterBubble* GetMessageCenterBubbleForTest(); 138 message_center::MessageCenterBubble* GetMessageCenterBubbleForTest();
138 message_center::MessagePopupBubble* GetPopupBubbleForTest(); 139 message_center::MessagePopupBubble* GetPopupBubbleForTest();
139 140
140 scoped_ptr<message_center::MessageCenterTray> message_center_tray_; 141 scoped_ptr<message_center::MessageCenterTray> message_center_tray_;
141 scoped_ptr<internal::WebNotificationBubbleWrapper> message_center_bubble_; 142 scoped_ptr<internal::WebNotificationBubbleWrapper> message_center_bubble_;
142 scoped_ptr<internal::WebNotificationBubbleWrapper> popup_bubble_; 143 scoped_ptr<internal::WebNotificationBubbleWrapper> popup_bubble_;
143 scoped_ptr<message_center::MessagePopupCollection> popup_collection_; 144 scoped_ptr<message_center::MessagePopupCollection> popup_collection_;
144 scoped_ptr<views::MenuRunner> quiet_mode_menu_runner_; 145 scoped_ptr<views::MenuRunner> quiet_mode_menu_runner_;
145 views::ImageButton* button_; 146 internal::WebNotificationButton* button_;
146 147
147 bool show_message_center_on_unlock_; 148 bool show_message_center_on_unlock_;
148 149
149 DISALLOW_COPY_AND_ASSIGN(WebNotificationTray); 150 DISALLOW_COPY_AND_ASSIGN(WebNotificationTray);
150 }; 151 };
151 152
152 } // namespace ash 153 } // namespace ash
153 154
154 #endif // ASH_SYSTEM_WEB_NOTIFICATION_WEB_NOTIFICATION_TRAY_H_ 155 #endif // ASH_SYSTEM_WEB_NOTIFICATION_WEB_NOTIFICATION_TRAY_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698