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

Side by Side Diff: ash/system/tray/system_tray.h

Issue 2099603002: Reland: mash: Convert TrayBackgroundView to wm common types (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix conflict Created 4 years, 6 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_TRAY_SYSTEM_TRAY_H_ 5 #ifndef ASH_SYSTEM_TRAY_SYSTEM_TRAY_H_
6 #define ASH_SYSTEM_TRAY_SYSTEM_TRAY_H_ 6 #define ASH_SYSTEM_TRAY_SYSTEM_TRAY_H_
7 7
8 #include <map> 8 #include <map>
9 #include <memory> 9 #include <memory>
10 #include <vector> 10 #include <vector>
11 11
12 #include "ash/ash_export.h" 12 #include "ash/ash_export.h"
13 #include "ash/common/system/tray/system_tray_bubble.h"
14 #include "ash/common/system/tray/tray_background_view.h"
13 #include "ash/system/cast/tray_cast.h" 15 #include "ash/system/cast/tray_cast.h"
14 #include "ash/system/tray/system_tray_bubble.h"
15 #include "ash/system/tray/tray_background_view.h"
16 #include "ash/system/user/login_status.h" 16 #include "ash/system/user/login_status.h"
17 #include "base/compiler_specific.h"
18 #include "base/macros.h" 17 #include "base/macros.h"
19 #include "base/memory/scoped_vector.h" 18 #include "base/memory/scoped_vector.h"
20 #include "ui/views/bubble/tray_bubble_view.h" 19 #include "ui/views/bubble/tray_bubble_view.h"
21 #include "ui/views/view.h" 20 #include "ui/views/view.h"
22 21
23 namespace ash { 22 namespace ash {
24 class ScreenTrayItem; 23 class ScreenTrayItem;
24 class StatusAreaWidget;
25 class SystemBubbleWrapper; 25 class SystemBubbleWrapper;
26 class SystemTrayDelegate; 26 class SystemTrayDelegate;
27 class SystemTrayItem; 27 class SystemTrayItem;
28 class TrayAccessibility; 28 class TrayAccessibility;
29 class TrayDate; 29 class TrayDate;
30 class TrayUpdate; 30 class TrayUpdate;
31 class TrayUser; 31 class TrayUser;
32 32
33 // There are different methods for creating bubble views. 33 // There are different methods for creating bubble views.
34 enum BubbleCreationType { 34 enum BubbleCreationType {
(...skipping 171 matching lines...) Expand 10 before | Expand all | Expand 10 after
206 206
207 // Records UMA metrics for the number of user-visible rows in the system menu 207 // Records UMA metrics for the number of user-visible rows in the system menu
208 // and the percentage of the work area height covered by the system menu. 208 // and the percentage of the work area height covered by the system menu.
209 void RecordSystemMenuMetrics(); 209 void RecordSystemMenuMetrics();
210 210
211 const ScopedVector<SystemTrayItem>& items() const { return items_; } 211 const ScopedVector<SystemTrayItem>& items() const { return items_; }
212 212
213 // Overridden from ActionableView. 213 // Overridden from ActionableView.
214 bool PerformAction(const ui::Event& event) override; 214 bool PerformAction(const ui::Event& event) override;
215 215
216 // The widget containing this view.
217 StatusAreaWidget* status_area_widget_;
218
216 // Owned items. 219 // Owned items.
217 ScopedVector<SystemTrayItem> items_; 220 ScopedVector<SystemTrayItem> items_;
218 221
219 // Pointers to members of |items_|. 222 // Pointers to members of |items_|.
220 SystemTrayItem* detailed_item_; 223 SystemTrayItem* detailed_item_;
221 std::vector<SystemTrayItem*> notification_items_; 224 std::vector<SystemTrayItem*> notification_items_;
222 225
223 // Mappings of system tray item and it's view in the tray. 226 // Mappings of system tray item and it's view in the tray.
224 std::map<SystemTrayItem*, views::View*> tray_item_map_; 227 std::map<SystemTrayItem*, views::View*> tray_item_map_;
225 228
(...skipping 24 matching lines...) Expand all
250 // A reference to the Screen share and capture item. 253 // A reference to the Screen share and capture item.
251 ScreenTrayItem* screen_capture_tray_item_; // not owned 254 ScreenTrayItem* screen_capture_tray_item_; // not owned
252 ScreenTrayItem* screen_share_tray_item_; // not owned 255 ScreenTrayItem* screen_share_tray_item_; // not owned
253 256
254 DISALLOW_COPY_AND_ASSIGN(SystemTray); 257 DISALLOW_COPY_AND_ASSIGN(SystemTray);
255 }; 258 };
256 259
257 } // namespace ash 260 } // namespace ash
258 261
259 #endif // ASH_SYSTEM_TRAY_SYSTEM_TRAY_H_ 262 #endif // ASH_SYSTEM_TRAY_SYSTEM_TRAY_H_
OLDNEW
« no previous file with comments | « ash/system/tray/media_security/multi_profile_media_tray_item_unittest.cc ('k') | ash/system/tray/system_tray.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698