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

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

Issue 2855143004: Implements a display scale tray setting behind a chrome switch (Closed)
Patch Set: Sync with ToT 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/display_scale/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 TrayNightLight; 32 class TrayNightLight;
33 class TrayScale;
33 class TraySupervisedUser; 34 class TraySupervisedUser;
34 class TraySystemInfo; 35 class TraySystemInfo;
35 class TrayTiles; 36 class TrayTiles;
36 class TrayUpdate; 37 class TrayUpdate;
37 class WebNotificationTray; 38 class WebNotificationTray;
38 39
39 // There are different methods for creating bubble views. 40 // There are different methods for creating bubble views.
40 enum BubbleCreationType { 41 enum BubbleCreationType {
41 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.
42 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.
(...skipping 184 matching lines...) Expand 10 before | Expand all | Expand 10 after
227 // Note that the value is only valid when |system_bubble_| is true. 228 // Note that the value is only valid when |system_bubble_| is true.
228 bool full_system_tray_menu_ = false; 229 bool full_system_tray_menu_ = false;
229 230
230 // These objects are not owned by this class. 231 // These objects are not owned by this class.
231 TrayAccessibility* tray_accessibility_ = nullptr; 232 TrayAccessibility* tray_accessibility_ = nullptr;
232 TrayAudio* tray_audio_ = nullptr; 233 TrayAudio* tray_audio_ = nullptr;
233 TrayCast* tray_cast_ = nullptr; 234 TrayCast* tray_cast_ = nullptr;
234 TrayEnterprise* tray_enterprise_ = nullptr; 235 TrayEnterprise* tray_enterprise_ = nullptr;
235 TrayNetwork* tray_network_ = nullptr; 236 TrayNetwork* tray_network_ = nullptr;
236 TrayTiles* tray_tiles_ = nullptr; 237 TrayTiles* tray_tiles_ = nullptr;
238 TrayScale* tray_scale_ = nullptr;
237 TraySupervisedUser* tray_supervised_user_ = nullptr; 239 TraySupervisedUser* tray_supervised_user_ = nullptr;
238 TraySystemInfo* tray_system_info_ = nullptr; 240 TraySystemInfo* tray_system_info_ = nullptr;
239 TrayUpdate* tray_update_ = nullptr; 241 TrayUpdate* tray_update_ = nullptr;
240 TrayNightLight* tray_night_light_ = nullptr; 242 TrayNightLight* tray_night_light_ = nullptr;
241 243
242 // A reference to the Screen share and capture item. 244 // A reference to the Screen share and capture item.
243 ScreenTrayItem* screen_capture_tray_item_ = nullptr; // not owned 245 ScreenTrayItem* screen_capture_tray_item_ = nullptr; // not owned
244 ScreenTrayItem* screen_share_tray_item_ = nullptr; // not owned 246 ScreenTrayItem* screen_share_tray_item_ = nullptr; // not owned
245 247
246 std::unique_ptr<KeyEventWatcher> key_event_watcher_; 248 std::unique_ptr<KeyEventWatcher> key_event_watcher_;
247 249
248 std::unique_ptr<ActivationObserver> activation_observer_; 250 std::unique_ptr<ActivationObserver> activation_observer_;
249 251
250 DISALLOW_COPY_AND_ASSIGN(SystemTray); 252 DISALLOW_COPY_AND_ASSIGN(SystemTray);
251 }; 253 };
252 254
253 } // namespace ash 255 } // namespace ash
254 256
255 #endif // ASH_SYSTEM_TRAY_SYSTEM_TRAY_H_ 257 #endif // ASH_SYSTEM_TRAY_SYSTEM_TRAY_H_
OLDNEW
« no previous file with comments | « ash/system/display_scale/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