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

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

Issue 2849953004: SV Test
Patch Set: 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
« no previous file with comments | « ash/system/fractional_view/tray_scale.cc ('k') | ash/system/tray/system_tray.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 12 matching lines...) Expand all
23 class ScreenTrayItem; 23 class ScreenTrayItem;
24 class SystemBubbleWrapper; 24 class SystemBubbleWrapper;
25 class SystemTrayDelegate; 25 class SystemTrayDelegate;
26 class SystemTrayItem; 26 class SystemTrayItem;
27 class TrayAccessibility; 27 class TrayAccessibility;
28 class TrayAudio; 28 class TrayAudio;
29 class TrayCast; 29 class TrayCast;
30 class TrayEnterprise; 30 class TrayEnterprise;
31 class TrayNetwork; 31 class TrayNetwork;
32 class TraySupervisedUser; 32 class TraySupervisedUser;
33 class TrayScale;
33 class TraySystemInfo; 34 class TraySystemInfo;
34 class TrayTiles; 35 class TrayTiles;
35 class TrayUpdate; 36 class TrayUpdate;
36 class WebNotificationTray; 37 class WebNotificationTray;
37 38
38 // There are different methods for creating bubble views. 39 // There are different methods for creating bubble views.
39 enum BubbleCreationType { 40 enum BubbleCreationType {
40 BUBBLE_CREATE_NEW, // Closes any existing bubble and creates a new one. 41 BUBBLE_CREATE_NEW, // Closes any existing bubble and creates a new one.
41 BUBBLE_USE_EXISTING, // Uses any existing bubble, or creates a new one. 42 BUBBLE_USE_EXISTING, // Uses any existing bubble, or creates a new one.
42 }; 43 };
(...skipping 184 matching lines...) Expand 10 before | Expand all | Expand 10 after
227 // These objects are not owned by this class. 228 // These objects are not owned by this class.
228 TrayAccessibility* tray_accessibility_ = nullptr; 229 TrayAccessibility* tray_accessibility_ = nullptr;
229 TrayAudio* tray_audio_ = nullptr; 230 TrayAudio* tray_audio_ = nullptr;
230 TrayCast* tray_cast_ = nullptr; 231 TrayCast* tray_cast_ = nullptr;
231 TrayEnterprise* tray_enterprise_ = nullptr; 232 TrayEnterprise* tray_enterprise_ = nullptr;
232 TrayNetwork* tray_network_ = nullptr; 233 TrayNetwork* tray_network_ = nullptr;
233 TrayTiles* tray_tiles_ = nullptr; 234 TrayTiles* tray_tiles_ = nullptr;
234 TraySupervisedUser* tray_supervised_user_ = nullptr; 235 TraySupervisedUser* tray_supervised_user_ = nullptr;
235 TraySystemInfo* tray_system_info_ = nullptr; 236 TraySystemInfo* tray_system_info_ = nullptr;
236 TrayUpdate* tray_update_ = nullptr; 237 TrayUpdate* tray_update_ = nullptr;
238 TrayScale* tray_scale_ = nullptr;
237 239
238 // A reference to the Screen share and capture item. 240 // A reference to the Screen share and capture item.
239 ScreenTrayItem* screen_capture_tray_item_ = nullptr; // not owned 241 ScreenTrayItem* screen_capture_tray_item_ = nullptr; // not owned
240 ScreenTrayItem* screen_share_tray_item_ = nullptr; // not owned 242 ScreenTrayItem* screen_share_tray_item_ = nullptr; // not owned
241 243
242 std::unique_ptr<KeyEventWatcher> key_event_watcher_; 244 std::unique_ptr<KeyEventWatcher> key_event_watcher_;
243 245
244 std::unique_ptr<ActivationObserver> activation_observer_; 246 std::unique_ptr<ActivationObserver> activation_observer_;
245 247
246 DISALLOW_COPY_AND_ASSIGN(SystemTray); 248 DISALLOW_COPY_AND_ASSIGN(SystemTray);
247 }; 249 };
248 250
249 } // namespace ash 251 } // namespace ash
250 252
251 #endif // ASH_SYSTEM_TRAY_SYSTEM_TRAY_H_ 253 #endif // ASH_SYSTEM_TRAY_SYSTEM_TRAY_H_
OLDNEW
« no previous file with comments | « ash/system/fractional_view/tray_scale.cc ('k') | ash/system/tray/system_tray.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698