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

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

Issue 10854175: Revert 151752 - Move non SystemTray specific code to TrayBackgroundView (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 4 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_NOTIFICATION_WEB_NOTIFICATION_TRAY_H_ 5 #ifndef ASH_SYSTEM_NOTIFICATION_WEB_NOTIFICATION_TRAY_H_
6 #define ASH_SYSTEM_NOTIFICATION_WEB_NOTIFICATION_TRAY_H_ 6 #define ASH_SYSTEM_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 100 matching lines...) Expand 10 before | Expand all | Expand 10 after
111 void ShowNotificationBubble(); 111 void ShowNotificationBubble();
112 112
113 // Hide the single notification bubble if visible. 113 // Hide the single notification bubble if visible.
114 void HideNotificationBubble(); 114 void HideNotificationBubble();
115 115
116 // Updates tray visibility login status of the system changes. 116 // Updates tray visibility login status of the system changes.
117 void UpdateAfterLoginStatusChange(user::LoginStatus login_status); 117 void UpdateAfterLoginStatusChange(user::LoginStatus login_status);
118 118
119 // Overridden from TrayBackgroundView. 119 // Overridden from TrayBackgroundView.
120 virtual void SetShelfAlignment(ShelfAlignment alignment) OVERRIDE; 120 virtual void SetShelfAlignment(ShelfAlignment alignment) OVERRIDE;
121 virtual void AnchorUpdated() OVERRIDE;
122 121
123 // Overridden from internal::ActionableView. 122 // Overridden from internal::ActionableView.
124 virtual bool PerformAction(const ui::Event& event) OVERRIDE; 123 virtual bool PerformAction(const ui::Event& event) OVERRIDE;
125 124
126 protected: 125 protected:
127 // Send a remove request to the delegate. 126 // Send a remove request to the delegate.
128 void SendRemoveNotification(const std::string& id); 127 void SendRemoveNotification(const std::string& id);
129 128
130 // Send a remove request for all notifications to the delegate. 129 // Send a remove request for all notifications to the delegate.
131 void SendRemoveAllNotifications(); 130 void SendRemoveAllNotifications();
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
167 views::Label* count_label_; 166 views::Label* count_label_;
168 Delegate* delegate_; 167 Delegate* delegate_;
169 bool show_message_center_on_unlock_; 168 bool show_message_center_on_unlock_;
170 169
171 DISALLOW_COPY_AND_ASSIGN(WebNotificationTray); 170 DISALLOW_COPY_AND_ASSIGN(WebNotificationTray);
172 }; 171 };
173 172
174 } // namespace ash 173 } // namespace ash
175 174
176 #endif // ASH_SYSTEM_NOTIFICATION_WEB_NOTIFICATION_TRAY_H_ 175 #endif // ASH_SYSTEM_NOTIFICATION_WEB_NOTIFICATION_TRAY_H_
OLDNEW
« no previous file with comments | « ash/system/tray/tray_background_view.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