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

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

Issue 11958025: Start delegating notifications to MessageCenter on Windows. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: another build fix 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 | Annotate | Revision Log
« no previous file with comments | « ash/shell.cc ('k') | ash/system/web_notification/web_notification_tray.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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" 10 #include "ash/system/tray/tray_views.h"
(...skipping 137 matching lines...) Expand 10 before | Expand all | Expand 10 after
148 } 148 }
149 149
150 message_center::QuietModeBubble* quiet_mode_bubble() const { 150 message_center::QuietModeBubble* quiet_mode_bubble() const {
151 return quiet_mode_bubble_.get(); 151 return quiet_mode_bubble_.get();
152 } 152 }
153 153
154 // Testing accessors. 154 // Testing accessors.
155 message_center::MessageCenterBubble* GetMessageCenterBubbleForTest(); 155 message_center::MessageCenterBubble* GetMessageCenterBubbleForTest();
156 message_center::MessagePopupBubble* GetPopupBubbleForTest(); 156 message_center::MessagePopupBubble* GetPopupBubbleForTest();
157 157
158 message_center::MessageCenter* message_center_; 158 message_center::MessageCenter* message_center_; // Weak, owned by ash::Shell
159 scoped_ptr<internal::WebNotificationBubbleWrapper> message_center_bubble_; 159 scoped_ptr<internal::WebNotificationBubbleWrapper> message_center_bubble_;
160 scoped_ptr<internal::WebNotificationBubbleWrapper> popup_bubble_; 160 scoped_ptr<internal::WebNotificationBubbleWrapper> popup_bubble_;
161 scoped_ptr<message_center::QuietModeBubble> quiet_mode_bubble_; 161 scoped_ptr<message_center::QuietModeBubble> quiet_mode_bubble_;
162 views::ImageButton* button_; 162 views::ImageButton* button_;
163 bool show_message_center_on_unlock_; 163 bool show_message_center_on_unlock_;
164 164
165 DISALLOW_COPY_AND_ASSIGN(WebNotificationTray); 165 DISALLOW_COPY_AND_ASSIGN(WebNotificationTray);
166 }; 166 };
167 167
168 } // namespace ash 168 } // namespace ash
169 169
170 #endif // ASH_SYSTEM_WEB_NOTIFICATION_WEB_NOTIFICATION_TRAY_H_ 170 #endif // ASH_SYSTEM_WEB_NOTIFICATION_WEB_NOTIFICATION_TRAY_H_
OLDNEW
« no previous file with comments | « ash/shell.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