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

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

Issue 18247002: Remove the most obvious dead code from message center. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Pull out more code. Created 7 years, 5 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 15 matching lines...) Expand all
26 26
27 namespace views { 27 namespace views {
28 class ImageButton; 28 class ImageButton;
29 class MenuRunner; 29 class MenuRunner;
30 } 30 }
31 31
32 namespace message_center { 32 namespace message_center {
33 class MessageBubbleBase; 33 class MessageBubbleBase;
34 class MessageCenter; 34 class MessageCenter;
35 class MessageCenterBubble; 35 class MessageCenterBubble;
36 class MessagePopupBubble;
37 class MessagePopupCollection; 36 class MessagePopupCollection;
38 } 37 }
39 38
40 namespace ash { 39 namespace ash {
41 40
42 namespace internal { 41 namespace internal {
43 class StatusAreaWidget; 42 class StatusAreaWidget;
44 class WebNotificationBubbleWrapper; 43 class WebNotificationBubbleWrapper;
45 class WebNotificationButton; 44 class WebNotificationButton;
46 } 45 }
(...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after
138 return message_center_bubble_.get(); 137 return message_center_bubble_.get();
139 } 138 }
140 139
141 internal::WebNotificationBubbleWrapper* popup_bubble() const { 140 internal::WebNotificationBubbleWrapper* popup_bubble() const {
142 return popup_bubble_.get(); 141 return popup_bubble_.get();
143 } 142 }
144 143
145 // Testing accessors. 144 // Testing accessors.
146 bool IsPopupVisible() const; 145 bool IsPopupVisible() const;
147 message_center::MessageCenterBubble* GetMessageCenterBubbleForTest(); 146 message_center::MessageCenterBubble* GetMessageCenterBubbleForTest();
148 message_center::MessagePopupBubble* GetPopupBubbleForTest();
149 147
150 scoped_ptr<message_center::MessageCenterTray> message_center_tray_; 148 scoped_ptr<message_center::MessageCenterTray> message_center_tray_;
151 scoped_ptr<internal::WebNotificationBubbleWrapper> message_center_bubble_; 149 scoped_ptr<internal::WebNotificationBubbleWrapper> message_center_bubble_;
152 scoped_ptr<internal::WebNotificationBubbleWrapper> popup_bubble_; 150 scoped_ptr<internal::WebNotificationBubbleWrapper> popup_bubble_;
Jun Mukai 2013/07/01 20:48:58 you can remove popup_bubble_ field too
dewittj 2013/07/01 23:58:30 Done.
153 scoped_ptr<message_center::MessagePopupCollection> popup_collection_; 151 scoped_ptr<message_center::MessagePopupCollection> popup_collection_;
154 scoped_ptr<views::MenuRunner> quiet_mode_menu_runner_; 152 scoped_ptr<views::MenuRunner> quiet_mode_menu_runner_;
155 internal::WebNotificationButton* button_; 153 internal::WebNotificationButton* button_;
156 154
157 bool show_message_center_on_unlock_; 155 bool show_message_center_on_unlock_;
158 156
159 bool should_update_tray_content_; 157 bool should_update_tray_content_;
160 158
161 // True when the shelf auto hide behavior has to be blocked. Previously 159 // True when the shelf auto hide behavior has to be blocked. Previously
162 // this was done by checking |message_center_bubble_| but actually 160 // this was done by checking |message_center_bubble_| but actually
163 // the check can be called when creating this object, so it would cause 161 // the check can be called when creating this object, so it would cause
164 // flickers of the shelf from hidden to shown. See: crbug.com/181213 162 // flickers of the shelf from hidden to shown. See: crbug.com/181213
165 bool should_block_shelf_auto_hide_; 163 bool should_block_shelf_auto_hide_;
166 164
167 DISALLOW_COPY_AND_ASSIGN(WebNotificationTray); 165 DISALLOW_COPY_AND_ASSIGN(WebNotificationTray);
168 }; 166 };
169 167
170 } // namespace ash 168 } // namespace ash
171 169
172 #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 | « no previous file | ash/system/web_notification/web_notification_tray.cc » ('j') | ui/message_center/views/message_bubble_base.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698