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

Side by Side Diff: ash/common/system/tray/system_tray_notifier.h

Issue 2190773002: Fix Volume slider is captured in screenshot done in touchview mode (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 4 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 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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_COMMON_SYSTEM_TRAY_SYSTEM_TRAY_NOTIFIER_H_ 5 #ifndef ASH_COMMON_SYSTEM_TRAY_SYSTEM_TRAY_NOTIFIER_H_
6 #define ASH_COMMON_SYSTEM_TRAY_SYSTEM_TRAY_NOTIFIER_H_ 6 #define ASH_COMMON_SYSTEM_TRAY_SYSTEM_TRAY_NOTIFIER_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "ash/ash_export.h" 10 #include "ash/ash_export.h"
11 #include "ash/common/accessibility_types.h" 11 #include "ash/common/accessibility_types.h"
12 #include "ash/common/system/locale/locale_observer.h" 12 #include "ash/common/system/locale/locale_observer.h"
13 #include "base/macros.h" 13 #include "base/macros.h"
14 #include "base/observer_list.h" 14 #include "base/observer_list.h"
15 15
16 #if defined(OS_CHROMEOS) 16 #if defined(OS_CHROMEOS)
17 #include "base/strings/string16.h" 17 #include "base/strings/string16.h"
18 #include "base/time/time.h" 18 #include "base/time/time.h"
19 #endif 19 #endif
20 20
21 namespace ash { 21 namespace ash {
22 22
23 class AccessibilityObserver; 23 class AccessibilityObserver;
24 class AudioObserver; 24 class AudioObserver;
25 class ClockObserver; 25 class ClockObserver;
26 class IMEObserver; 26 class IMEObserver;
27 class MaximizeModeScreenshotObserver;
27 struct UpdateInfo; 28 struct UpdateInfo;
28 class UpdateObserver; 29 class UpdateObserver;
29 class UserObserver; 30 class UserObserver;
30 31
31 #if defined(OS_CHROMEOS) 32 #if defined(OS_CHROMEOS)
32 class BluetoothObserver; 33 class BluetoothObserver;
33 class EnterpriseDomainObserver; 34 class EnterpriseDomainObserver;
34 class LastWindowClosedObserver; 35 class LastWindowClosedObserver;
35 class LogoutButtonObserver; 36 class LogoutButtonObserver;
36 class MediaCaptureObserver; 37 class MediaCaptureObserver;
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
90 void AddUpdateObserver(UpdateObserver* observer); 91 void AddUpdateObserver(UpdateObserver* observer);
91 void RemoveUpdateObserver(UpdateObserver* observer); 92 void RemoveUpdateObserver(UpdateObserver* observer);
92 void NotifyUpdateRecommended(const UpdateInfo& info); 93 void NotifyUpdateRecommended(const UpdateInfo& info);
93 94
94 // User. 95 // User.
95 void AddUserObserver(UserObserver* observer); 96 void AddUserObserver(UserObserver* observer);
96 void RemoveUserObserver(UserObserver* observer); 97 void RemoveUserObserver(UserObserver* observer);
97 void NotifyUserUpdate(); 98 void NotifyUserUpdate();
98 void NotifyUserAddedToSession(); 99 void NotifyUserAddedToSession();
99 100
101 // Maximize mode screenshot.
102 void AddMaxModeScreenshotObserver(MaximizeModeScreenshotObserver* observer);
Daniel Erat 2016/07/27 23:51:31 s/MaxMode/MaximizeMode/ here and on the next line;
Qiang(Joe) Xu 2016/07/28 03:27:18 Done.
103 void RemoveMaxModeScreenshotObserver(
104 MaximizeModeScreenshotObserver* observer);
105 void NotifyWillTakeScreenshot(int volume_percent);
106 void NotifyDidTakeScreenshot();
Daniel Erat 2016/07/27 23:51:31 maybe rename these to: NotifyWillTakeScreenshot
Qiang(Joe) Xu 2016/07/28 00:15:39 Hi, to get a better understanding, what is Suppres
Daniel Erat 2016/07/28 00:25:56 i meant that PBC could call a new TrayAudio method
Qiang(Joe) Xu 2016/07/28 03:27:18 I still keep MaximizeModeScreenshotObserver in Sys
107
100 #if defined(OS_CHROMEOS) 108 #if defined(OS_CHROMEOS)
101 // Bluetooth. 109 // Bluetooth.
102 void AddBluetoothObserver(BluetoothObserver* observer); 110 void AddBluetoothObserver(BluetoothObserver* observer);
103 void RemoveBluetoothObserver(BluetoothObserver* observer); 111 void RemoveBluetoothObserver(BluetoothObserver* observer);
104 void NotifyRefreshBluetooth(); 112 void NotifyRefreshBluetooth();
105 void NotifyBluetoothDiscoveringChanged(); 113 void NotifyBluetoothDiscoveringChanged();
106 114
107 // Enterprise domain. 115 // Enterprise domain.
108 void AddEnterpriseDomainObserver(EnterpriseDomainObserver* observer); 116 void AddEnterpriseDomainObserver(EnterpriseDomainObserver* observer);
109 void RemoveEnterpriseDomainObserver(EnterpriseDomainObserver* observer); 117 void RemoveEnterpriseDomainObserver(EnterpriseDomainObserver* observer);
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
167 void RemoveVirtualKeyboardObserver(VirtualKeyboardObserver* observer); 175 void RemoveVirtualKeyboardObserver(VirtualKeyboardObserver* observer);
168 void NotifyVirtualKeyboardSuppressionChanged(bool suppressed); 176 void NotifyVirtualKeyboardSuppressionChanged(bool suppressed);
169 #endif 177 #endif
170 178
171 private: 179 private:
172 base::ObserverList<AccessibilityObserver> accessibility_observers_; 180 base::ObserverList<AccessibilityObserver> accessibility_observers_;
173 base::ObserverList<AudioObserver> audio_observers_; 181 base::ObserverList<AudioObserver> audio_observers_;
174 base::ObserverList<ClockObserver> clock_observers_; 182 base::ObserverList<ClockObserver> clock_observers_;
175 base::ObserverList<IMEObserver> ime_observers_; 183 base::ObserverList<IMEObserver> ime_observers_;
176 base::ObserverList<LocaleObserver> locale_observers_; 184 base::ObserverList<LocaleObserver> locale_observers_;
185 base::ObserverList<MaximizeModeScreenshotObserver>
186 maximize_mode_screenshot_observers_;
177 base::ObserverList<UpdateObserver> update_observers_; 187 base::ObserverList<UpdateObserver> update_observers_;
178 base::ObserverList<UserObserver> user_observers_; 188 base::ObserverList<UserObserver> user_observers_;
179 189
180 #if defined(OS_CHROMEOS) 190 #if defined(OS_CHROMEOS)
181 base::ObserverList<BluetoothObserver> bluetooth_observers_; 191 base::ObserverList<BluetoothObserver> bluetooth_observers_;
182 base::ObserverList<EnterpriseDomainObserver> enterprise_domain_observers_; 192 base::ObserverList<EnterpriseDomainObserver> enterprise_domain_observers_;
183 base::ObserverList<LastWindowClosedObserver> last_window_closed_observers_; 193 base::ObserverList<LastWindowClosedObserver> last_window_closed_observers_;
184 base::ObserverList<LogoutButtonObserver> logout_button_observers_; 194 base::ObserverList<LogoutButtonObserver> logout_button_observers_;
185 base::ObserverList<MediaCaptureObserver> media_capture_observers_; 195 base::ObserverList<MediaCaptureObserver> media_capture_observers_;
186 base::ObserverList<NetworkObserver> network_observers_; 196 base::ObserverList<NetworkObserver> network_observers_;
187 base::ObserverList<NetworkPortalDetectorObserver> 197 base::ObserverList<NetworkPortalDetectorObserver>
188 network_portal_detector_observers_; 198 network_portal_detector_observers_;
189 base::ObserverList<ScreenCaptureObserver> screen_capture_observers_; 199 base::ObserverList<ScreenCaptureObserver> screen_capture_observers_;
190 base::ObserverList<ScreenShareObserver> screen_share_observers_; 200 base::ObserverList<ScreenShareObserver> screen_share_observers_;
191 base::ObserverList<SessionLengthLimitObserver> 201 base::ObserverList<SessionLengthLimitObserver>
192 session_length_limit_observers_; 202 session_length_limit_observers_;
193 base::ObserverList<TracingObserver> tracing_observers_; 203 base::ObserverList<TracingObserver> tracing_observers_;
194 base::ObserverList<VirtualKeyboardObserver> virtual_keyboard_observers_; 204 base::ObserverList<VirtualKeyboardObserver> virtual_keyboard_observers_;
195 #endif 205 #endif
196 206
197 DISALLOW_COPY_AND_ASSIGN(SystemTrayNotifier); 207 DISALLOW_COPY_AND_ASSIGN(SystemTrayNotifier);
198 }; 208 };
199 209
200 } // namespace ash 210 } // namespace ash
201 211
202 #endif // ASH_COMMON_SYSTEM_TRAY_SYSTEM_TRAY_NOTIFIER_H_ 212 #endif // ASH_COMMON_SYSTEM_TRAY_SYSTEM_TRAY_NOTIFIER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698