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

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

Issue 2899253002: chromeos: Rename ash::WmShelf to Shelf (Closed)
Patch Set: rebase Created 3 years, 7 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"
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
43 // Note: These are not related to system notifications (i.e NotificationView 43 // Note: These are not related to system notifications (i.e NotificationView
44 // generated by SystemTrayItem). Visibility of one notification type or other 44 // generated by SystemTrayItem). Visibility of one notification type or other
45 // is controlled by StatusAreaWidget. 45 // is controlled by StatusAreaWidget.
46 class ASH_EXPORT WebNotificationTray 46 class ASH_EXPORT WebNotificationTray
47 : public TrayBackgroundView, 47 : public TrayBackgroundView,
48 public views::TrayBubbleView::Delegate, 48 public views::TrayBubbleView::Delegate,
49 public message_center::MessageCenterTrayDelegate, 49 public message_center::MessageCenterTrayDelegate,
50 public base::SupportsWeakPtr<WebNotificationTray>, 50 public base::SupportsWeakPtr<WebNotificationTray>,
51 public ui::SimpleMenuModel::Delegate { 51 public ui::SimpleMenuModel::Delegate {
52 public: 52 public:
53 WebNotificationTray(WmShelf* shelf, 53 WebNotificationTray(Shelf* shelf,
54 aura::Window* status_area_window, 54 aura::Window* status_area_window,
55 SystemTray* system_tray); 55 SystemTray* system_tray);
56 ~WebNotificationTray() override; 56 ~WebNotificationTray() override;
57 57
58 static void DisableAnimationsForTest(bool disable); 58 static void DisableAnimationsForTest(bool disable);
59 59
60 // Sets the height of the system tray bubble (or legacy notification bubble) 60 // Sets the height of the system tray bubble (or legacy notification bubble)
61 // from the edge of the work area so that the web notification popups don't 61 // from the edge of the work area so that the web notification popups don't
62 // overlap with the tray. Pass 0 if no bubble is shown. 62 // overlap with the tray. Pass 0 if no bubble is shown.
63 void SetTrayBubbleHeight(int height); 63 void SetTrayBubbleHeight(int height);
(...skipping 115 matching lines...) Expand 10 before | Expand all | Expand 10 after
179 bool should_block_shelf_auto_hide_; 179 bool should_block_shelf_auto_hide_;
180 180
181 std::unique_ptr<AshPopupAlignmentDelegate> popup_alignment_delegate_; 181 std::unique_ptr<AshPopupAlignmentDelegate> popup_alignment_delegate_;
182 182
183 DISALLOW_COPY_AND_ASSIGN(WebNotificationTray); 183 DISALLOW_COPY_AND_ASSIGN(WebNotificationTray);
184 }; 184 };
185 185
186 } // namespace ash 186 } // namespace ash
187 187
188 #endif // ASH_SYSTEM_WEB_NOTIFICATION_WEB_NOTIFICATION_TRAY_H_ 188 #endif // ASH_SYSTEM_WEB_NOTIFICATION_WEB_NOTIFICATION_TRAY_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698