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

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

Issue 2095663004: Revert of mash: Convert TrayBackgroundView to wm common types (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 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
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 <memory> 8 #include <memory>
9 9
10 #include "ash/ash_export.h" 10 #include "ash/ash_export.h"
11 #include "ash/common/login_status.h" 11 #include "ash/common/login_status.h"
12 #include "ash/common/system/tray/tray_background_view.h" 12 #include "ash/system/tray/tray_background_view.h"
13 #include "base/gtest_prod_util.h" 13 #include "base/gtest_prod_util.h"
14 #include "base/macros.h" 14 #include "base/macros.h"
15 #include "base/memory/weak_ptr.h" 15 #include "base/memory/weak_ptr.h"
16 #include "ui/base/models/simple_menu_model.h" 16 #include "ui/base/models/simple_menu_model.h"
17 #include "ui/message_center/message_center_tray.h" 17 #include "ui/message_center/message_center_tray.h"
18 #include "ui/message_center/message_center_tray_delegate.h" 18 #include "ui/message_center/message_center_tray_delegate.h"
19 #include "ui/views/bubble/tray_bubble_view.h" 19 #include "ui/views/bubble/tray_bubble_view.h"
20 #include "ui/views/controls/button/button.h" 20 #include "ui/views/controls/button/button.h"
21 21
22 // Status area tray for showing browser and app notifications. This hosts 22 // Status area tray for showing browser and app notifications. This hosts
(...skipping 139 matching lines...) Expand 10 before | Expand all | Expand 10 after
162 } 162 }
163 163
164 // Returns true if any user is logged in and the system is not at the screen 164 // Returns true if any user is logged in and the system is not at the screen
165 // for adding a secondary user. 165 // for adding a secondary user.
166 bool IsLoggedIn() const; 166 bool IsLoggedIn() const;
167 167
168 // Testing accessors. 168 // Testing accessors.
169 bool IsPopupVisible() const; 169 bool IsPopupVisible() const;
170 message_center::MessageCenterBubble* GetMessageCenterBubbleForTest(); 170 message_center::MessageCenterBubble* GetMessageCenterBubbleForTest();
171 171
172 StatusAreaWidget* status_area_widget_;
173 std::unique_ptr<message_center::MessageCenterTray> message_center_tray_; 172 std::unique_ptr<message_center::MessageCenterTray> message_center_tray_;
174 std::unique_ptr<WebNotificationBubbleWrapper> message_center_bubble_; 173 std::unique_ptr<WebNotificationBubbleWrapper> message_center_bubble_;
175 std::unique_ptr<message_center::MessagePopupCollection> popup_collection_; 174 std::unique_ptr<message_center::MessagePopupCollection> popup_collection_;
176 WebNotificationButton* button_; 175 WebNotificationButton* button_;
177 176
178 bool show_message_center_on_unlock_; 177 bool show_message_center_on_unlock_;
179 178
180 bool should_update_tray_content_; 179 bool should_update_tray_content_;
181 180
182 // True when the shelf auto hide behavior has to be blocked. Previously 181 // True when the shelf auto hide behavior has to be blocked. Previously
183 // this was done by checking |message_center_bubble_| but actually 182 // this was done by checking |message_center_bubble_| but actually
184 // the check can be called when creating this object, so it would cause 183 // the check can be called when creating this object, so it would cause
185 // flickers of the shelf from hidden to shown. See: crbug.com/181213 184 // flickers of the shelf from hidden to shown. See: crbug.com/181213
186 bool should_block_shelf_auto_hide_; 185 bool should_block_shelf_auto_hide_;
187 186
188 std::unique_ptr<AshPopupAlignmentDelegate> popup_alignment_delegate_; 187 std::unique_ptr<AshPopupAlignmentDelegate> popup_alignment_delegate_;
189 188
190 DISALLOW_COPY_AND_ASSIGN(WebNotificationTray); 189 DISALLOW_COPY_AND_ASSIGN(WebNotificationTray);
191 }; 190 };
192 191
193 } // namespace ash 192 } // namespace ash
194 193
195 #endif // ASH_SYSTEM_WEB_NOTIFICATION_WEB_NOTIFICATION_TRAY_H_ 194 #endif // ASH_SYSTEM_WEB_NOTIFICATION_WEB_NOTIFICATION_TRAY_H_
OLDNEW
« no previous file with comments | « ash/system/tray/tray_event_filter.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