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

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

Issue 2899253002: chromeos: Rename ash::WmShelf to Shelf (Closed)
Patch Set: cleanup 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_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>
(...skipping 28 matching lines...) Expand all
39 39
40 // There are different methods for creating bubble views. 40 // There are different methods for creating bubble views.
41 enum BubbleCreationType { 41 enum BubbleCreationType {
42 BUBBLE_CREATE_NEW, // Closes any existing bubble and creates a new one. 42 BUBBLE_CREATE_NEW, // Closes any existing bubble and creates a new one.
43 BUBBLE_USE_EXISTING, // Uses any existing bubble, or creates a new one. 43 BUBBLE_USE_EXISTING, // Uses any existing bubble, or creates a new one.
44 }; 44 };
45 45
46 class ASH_EXPORT SystemTray : public TrayBackgroundView, 46 class ASH_EXPORT SystemTray : public TrayBackgroundView,
47 public views::TrayBubbleView::Delegate { 47 public views::TrayBubbleView::Delegate {
48 public: 48 public:
49 explicit SystemTray(WmShelf* wm_shelf); 49 explicit SystemTray(Shelf* shelf);
50 ~SystemTray() override; 50 ~SystemTray() override;
51 51
52 TrayUpdate* tray_update() { return tray_update_; } 52 TrayUpdate* tray_update() { return tray_update_; }
53 53
54 TrayNightLight* tray_night_light() { return tray_night_light_; } 54 TrayNightLight* tray_night_light() { return tray_night_light_; }
55 55
56 // Calls TrayBackgroundView::Initialize(), creates the tray items, and 56 // Calls TrayBackgroundView::Initialize(), creates the tray items, and
57 // adds them to SystemTrayNotifier. 57 // adds them to SystemTrayNotifier.
58 void InitializeTrayItems(SystemTrayDelegate* delegate, 58 void InitializeTrayItems(SystemTrayDelegate* delegate,
59 WebNotificationTray* web_notification_tray); 59 WebNotificationTray* web_notification_tray);
(...skipping 188 matching lines...) Expand 10 before | Expand all | Expand 10 after
248 std::unique_ptr<KeyEventWatcher> key_event_watcher_; 248 std::unique_ptr<KeyEventWatcher> key_event_watcher_;
249 249
250 std::unique_ptr<ActivationObserver> activation_observer_; 250 std::unique_ptr<ActivationObserver> activation_observer_;
251 251
252 DISALLOW_COPY_AND_ASSIGN(SystemTray); 252 DISALLOW_COPY_AND_ASSIGN(SystemTray);
253 }; 253 };
254 254
255 } // namespace ash 255 } // namespace ash
256 256
257 #endif // ASH_SYSTEM_TRAY_SYSTEM_TRAY_H_ 257 #endif // ASH_SYSTEM_TRAY_SYSTEM_TRAY_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698