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

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

Issue 2818183002: Open system menu when click the status tray with volume popup opend (Closed)
Patch Set: Update comment. Created 3 years, 8 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 | « no previous file | ash/system/tray/system_tray.cc » ('j') | ash/system/tray/system_tray.cc » ('J')
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 184 matching lines...) Expand 10 before | Expand all | Expand 10 after
195 void CloseSystemBubbleAndDeactivateSystemTray(); 195 void CloseSystemBubbleAndDeactivateSystemTray();
196 196
197 // Records UMA metrics for the number of user-visible rows in the system menu 197 // Records UMA metrics for the number of user-visible rows in the system menu
198 // and the percentage of the work area height covered by the system menu. 198 // and the percentage of the work area height covered by the system menu.
199 void RecordSystemMenuMetrics(); 199 void RecordSystemMenuMetrics();
200 200
201 // Overridden from ActionableView. 201 // Overridden from ActionableView.
202 bool PerformAction(const ui::Event& event) override; 202 bool PerformAction(const ui::Event& event) override;
203 203
204 // The web notification tray view that appears adjacent to this view. 204 // The web notification tray view that appears adjacent to this view.
205 WebNotificationTray* web_notification_tray_; 205 WebNotificationTray* web_notification_tray_ = nullptr;
206 206
207 // Items. 207 // Items.
208 std::vector<std::unique_ptr<SystemTrayItem>> items_; 208 std::vector<std::unique_ptr<SystemTrayItem>> items_;
209 209
210 // Pointers to members of |items_|. 210 // Pointers to members of |items_|.
211 SystemTrayItem* detailed_item_; 211 SystemTrayItem* detailed_item_ = nullptr;
212 212
213 // Mappings of system tray item and it's view in the tray. 213 // Mappings of system tray item and it's view in the tray.
214 std::map<SystemTrayItem*, views::View*> tray_item_map_; 214 std::map<SystemTrayItem*, views::View*> tray_item_map_;
215 215
216 // Bubble for default and detailed views. 216 // Bubble for default and detailed views.
217 std::unique_ptr<SystemBubbleWrapper> system_bubble_; 217 std::unique_ptr<SystemBubbleWrapper> system_bubble_;
218 218
219 // Keep track of the default view height so that when we create detailed 219 // Keep track of the default view height so that when we create detailed
220 // views directly (e.g. from a notification) we know what height to use. 220 // views directly (e.g. from a notification) we know what height to use.
221 int default_bubble_height_; 221 int default_bubble_height_ = 0;
222 222
223 // This is true when the displayed system tray menu is a full tray menu, 223 // This is true when the displayed system tray menu is a full tray menu,
224 // otherwise a single line item menu like the volume slider is shown. 224 // otherwise a single line item menu like the volume slider is shown.
225 // Note that the value is only valid when |system_bubble_| is true. 225 // Note that the value is only valid when |system_bubble_| is true.
226 bool full_system_tray_menu_; 226 bool full_system_tray_menu_ = false;
tdanderson 2017/04/19 16:10:40 Can you check to see if you can use the existing |
227
228 // This is true when the displayed detailed view has positive
229 // |close_delay_in_seconds_|. ex, audio popup detailed view
230 bool detailed_view_with_close_delay_ = false;
227 231
228 // These objects are not owned by this class. 232 // These objects are not owned by this class.
229 TrayAccessibility* tray_accessibility_; 233 TrayAccessibility* tray_accessibility_ = nullptr;
230 TrayAudio* tray_audio_; // May be null. 234 TrayAudio* tray_audio_ = nullptr; // May be null.
231 TrayCast* tray_cast_; 235 TrayCast* tray_cast_ = nullptr;
232 TrayNetwork* tray_network_; 236 TrayNetwork* tray_network_ = nullptr;
233 TrayTiles* tray_tiles_; // only used in material design. 237 TrayTiles* tray_tiles_ = nullptr; // only used in material design.
tdanderson 2017/04/18 17:59:14 nit: can you please remove the "only used in mater
234 TraySystemInfo* tray_system_info_; // only used in material design. 238 TraySystemInfo* tray_system_info_ = nullptr; // only used in material design.
235 TrayUpdate* tray_update_; 239 TrayUpdate* tray_update_ = nullptr;
236 240
237 // A reference to the Screen share and capture item. 241 // A reference to the Screen share and capture item.
238 ScreenTrayItem* screen_capture_tray_item_; // not owned 242 ScreenTrayItem* screen_capture_tray_item_ = nullptr; // not owned
239 ScreenTrayItem* screen_share_tray_item_; // not owned 243 ScreenTrayItem* screen_share_tray_item_ = nullptr; // not owned
240 244
241 std::unique_ptr<KeyEventWatcher> key_event_watcher_; 245 std::unique_ptr<KeyEventWatcher> key_event_watcher_;
242 246
243 std::unique_ptr<ActivationObserver> activation_observer_; 247 std::unique_ptr<ActivationObserver> activation_observer_;
244 248
245 DISALLOW_COPY_AND_ASSIGN(SystemTray); 249 DISALLOW_COPY_AND_ASSIGN(SystemTray);
246 }; 250 };
247 251
248 } // namespace ash 252 } // namespace ash
249 253
250 #endif // ASH_SYSTEM_TRAY_SYSTEM_TRAY_H_ 254 #endif // ASH_SYSTEM_TRAY_SYSTEM_TRAY_H_
OLDNEW
« no previous file with comments | « no previous file | ash/system/tray/system_tray.cc » ('j') | ash/system/tray/system_tray.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698