| OLD | NEW |
| 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 #include "ash/common/system/tray/system_tray_notifier.h" | 5 #include "ash/common/system/tray/system_tray_notifier.h" |
| 6 | 6 |
| 7 #include "ash/common/system/accessibility_observer.h" | 7 #include "ash/common/system/accessibility_observer.h" |
| 8 #include "ash/common/system/audio/audio_observer.h" | 8 #include "ash/common/system/audio/audio_observer.h" |
| 9 #include "ash/common/system/date/clock_observer.h" | 9 #include "ash/common/system/date/clock_observer.h" |
| 10 #include "ash/common/system/ime/ime_observer.h" | 10 #include "ash/common/system/ime/ime_observer.h" |
| (...skipping 26 matching lines...) Expand all Loading... |
| 37 accessibility_observers_.AddObserver(observer); | 37 accessibility_observers_.AddObserver(observer); |
| 38 } | 38 } |
| 39 | 39 |
| 40 void SystemTrayNotifier::RemoveAccessibilityObserver( | 40 void SystemTrayNotifier::RemoveAccessibilityObserver( |
| 41 AccessibilityObserver* observer) { | 41 AccessibilityObserver* observer) { |
| 42 accessibility_observers_.RemoveObserver(observer); | 42 accessibility_observers_.RemoveObserver(observer); |
| 43 } | 43 } |
| 44 | 44 |
| 45 void SystemTrayNotifier::NotifyAccessibilityModeChanged( | 45 void SystemTrayNotifier::NotifyAccessibilityModeChanged( |
| 46 AccessibilityNotificationVisibility notify) { | 46 AccessibilityNotificationVisibility notify) { |
| 47 FOR_EACH_OBSERVER(AccessibilityObserver, accessibility_observers_, | 47 for (auto& observer : accessibility_observers_) |
| 48 OnAccessibilityModeChanged(notify)); | 48 observer.OnAccessibilityModeChanged(notify); |
| 49 } | 49 } |
| 50 | 50 |
| 51 void SystemTrayNotifier::AddAudioObserver(AudioObserver* observer) { | 51 void SystemTrayNotifier::AddAudioObserver(AudioObserver* observer) { |
| 52 audio_observers_.AddObserver(observer); | 52 audio_observers_.AddObserver(observer); |
| 53 } | 53 } |
| 54 | 54 |
| 55 void SystemTrayNotifier::RemoveAudioObserver(AudioObserver* observer) { | 55 void SystemTrayNotifier::RemoveAudioObserver(AudioObserver* observer) { |
| 56 audio_observers_.RemoveObserver(observer); | 56 audio_observers_.RemoveObserver(observer); |
| 57 } | 57 } |
| 58 | 58 |
| 59 void SystemTrayNotifier::NotifyAudioOutputVolumeChanged(uint64_t node_id, | 59 void SystemTrayNotifier::NotifyAudioOutputVolumeChanged(uint64_t node_id, |
| 60 double volume) { | 60 double volume) { |
| 61 FOR_EACH_OBSERVER(AudioObserver, audio_observers_, | 61 for (auto& observer : audio_observers_) |
| 62 OnOutputNodeVolumeChanged(node_id, volume)); | 62 observer.OnOutputNodeVolumeChanged(node_id, volume); |
| 63 } | 63 } |
| 64 | 64 |
| 65 void SystemTrayNotifier::NotifyAudioOutputMuteChanged(bool mute_on, | 65 void SystemTrayNotifier::NotifyAudioOutputMuteChanged(bool mute_on, |
| 66 bool system_adjust) { | 66 bool system_adjust) { |
| 67 FOR_EACH_OBSERVER(AudioObserver, audio_observers_, | 67 for (auto& observer : audio_observers_) |
| 68 OnOutputMuteChanged(mute_on, system_adjust)); | 68 observer.OnOutputMuteChanged(mute_on, system_adjust); |
| 69 } | 69 } |
| 70 | 70 |
| 71 void SystemTrayNotifier::NotifyAudioNodesChanged() { | 71 void SystemTrayNotifier::NotifyAudioNodesChanged() { |
| 72 FOR_EACH_OBSERVER(AudioObserver, audio_observers_, OnAudioNodesChanged()); | 72 for (auto& observer : audio_observers_) |
| 73 observer.OnAudioNodesChanged(); |
| 73 } | 74 } |
| 74 | 75 |
| 75 void SystemTrayNotifier::NotifyAudioActiveOutputNodeChanged() { | 76 void SystemTrayNotifier::NotifyAudioActiveOutputNodeChanged() { |
| 76 FOR_EACH_OBSERVER(AudioObserver, audio_observers_, | 77 for (auto& observer : audio_observers_) |
| 77 OnActiveOutputNodeChanged()); | 78 observer.OnActiveOutputNodeChanged(); |
| 78 } | 79 } |
| 79 | 80 |
| 80 void SystemTrayNotifier::NotifyAudioActiveInputNodeChanged() { | 81 void SystemTrayNotifier::NotifyAudioActiveInputNodeChanged() { |
| 81 FOR_EACH_OBSERVER(AudioObserver, audio_observers_, | 82 for (auto& observer : audio_observers_) |
| 82 OnActiveInputNodeChanged()); | 83 observer.OnActiveInputNodeChanged(); |
| 83 } | 84 } |
| 84 | 85 |
| 85 void SystemTrayNotifier::AddClockObserver(ClockObserver* observer) { | 86 void SystemTrayNotifier::AddClockObserver(ClockObserver* observer) { |
| 86 clock_observers_.AddObserver(observer); | 87 clock_observers_.AddObserver(observer); |
| 87 } | 88 } |
| 88 | 89 |
| 89 void SystemTrayNotifier::RemoveClockObserver(ClockObserver* observer) { | 90 void SystemTrayNotifier::RemoveClockObserver(ClockObserver* observer) { |
| 90 clock_observers_.RemoveObserver(observer); | 91 clock_observers_.RemoveObserver(observer); |
| 91 } | 92 } |
| 92 | 93 |
| 93 void SystemTrayNotifier::NotifyRefreshClock() { | 94 void SystemTrayNotifier::NotifyRefreshClock() { |
| 94 FOR_EACH_OBSERVER(ClockObserver, clock_observers_, Refresh()); | 95 for (auto& observer : clock_observers_) |
| 96 observer.Refresh(); |
| 95 } | 97 } |
| 96 | 98 |
| 97 void SystemTrayNotifier::NotifyDateFormatChanged() { | 99 void SystemTrayNotifier::NotifyDateFormatChanged() { |
| 98 FOR_EACH_OBSERVER(ClockObserver, clock_observers_, OnDateFormatChanged()); | 100 for (auto& observer : clock_observers_) |
| 101 observer.OnDateFormatChanged(); |
| 99 } | 102 } |
| 100 | 103 |
| 101 void SystemTrayNotifier::NotifySystemClockTimeUpdated() { | 104 void SystemTrayNotifier::NotifySystemClockTimeUpdated() { |
| 102 FOR_EACH_OBSERVER(ClockObserver, clock_observers_, | 105 for (auto& observer : clock_observers_) |
| 103 OnSystemClockTimeUpdated()); | 106 observer.OnSystemClockTimeUpdated(); |
| 104 } | 107 } |
| 105 | 108 |
| 106 void SystemTrayNotifier::NotifySystemClockCanSetTimeChanged(bool can_set_time) { | 109 void SystemTrayNotifier::NotifySystemClockCanSetTimeChanged(bool can_set_time) { |
| 107 FOR_EACH_OBSERVER(ClockObserver, clock_observers_, | 110 for (auto& observer : clock_observers_) |
| 108 OnSystemClockCanSetTimeChanged(can_set_time)); | 111 observer.OnSystemClockCanSetTimeChanged(can_set_time); |
| 109 } | 112 } |
| 110 | 113 |
| 111 void SystemTrayNotifier::AddIMEObserver(IMEObserver* observer) { | 114 void SystemTrayNotifier::AddIMEObserver(IMEObserver* observer) { |
| 112 ime_observers_.AddObserver(observer); | 115 ime_observers_.AddObserver(observer); |
| 113 } | 116 } |
| 114 | 117 |
| 115 void SystemTrayNotifier::RemoveIMEObserver(IMEObserver* observer) { | 118 void SystemTrayNotifier::RemoveIMEObserver(IMEObserver* observer) { |
| 116 ime_observers_.RemoveObserver(observer); | 119 ime_observers_.RemoveObserver(observer); |
| 117 } | 120 } |
| 118 | 121 |
| 119 void SystemTrayNotifier::NotifyRefreshIME() { | 122 void SystemTrayNotifier::NotifyRefreshIME() { |
| 120 FOR_EACH_OBSERVER(IMEObserver, ime_observers_, OnIMERefresh()); | 123 for (auto& observer : ime_observers_) |
| 124 observer.OnIMERefresh(); |
| 121 } | 125 } |
| 122 | 126 |
| 123 void SystemTrayNotifier::NotifyRefreshIMEMenu(bool is_active) { | 127 void SystemTrayNotifier::NotifyRefreshIMEMenu(bool is_active) { |
| 124 FOR_EACH_OBSERVER(IMEObserver, ime_observers_, | 128 for (auto& observer : ime_observers_) |
| 125 OnIMEMenuActivationChanged(is_active)); | 129 observer.OnIMEMenuActivationChanged(is_active); |
| 126 } | 130 } |
| 127 | 131 |
| 128 void SystemTrayNotifier::AddLocaleObserver(LocaleObserver* observer) { | 132 void SystemTrayNotifier::AddLocaleObserver(LocaleObserver* observer) { |
| 129 locale_observers_.AddObserver(observer); | 133 locale_observers_.AddObserver(observer); |
| 130 } | 134 } |
| 131 | 135 |
| 132 void SystemTrayNotifier::RemoveLocaleObserver(LocaleObserver* observer) { | 136 void SystemTrayNotifier::RemoveLocaleObserver(LocaleObserver* observer) { |
| 133 locale_observers_.RemoveObserver(observer); | 137 locale_observers_.RemoveObserver(observer); |
| 134 } | 138 } |
| 135 | 139 |
| 136 void SystemTrayNotifier::NotifyLocaleChanged(LocaleObserver::Delegate* delegate, | 140 void SystemTrayNotifier::NotifyLocaleChanged(LocaleObserver::Delegate* delegate, |
| 137 const std::string& cur_locale, | 141 const std::string& cur_locale, |
| 138 const std::string& from_locale, | 142 const std::string& from_locale, |
| 139 const std::string& to_locale) { | 143 const std::string& to_locale) { |
| 140 FOR_EACH_OBSERVER( | 144 for (auto& observer : locale_observers_) |
| 141 LocaleObserver, locale_observers_, | 145 observer.OnLocaleChanged(delegate, cur_locale, from_locale, to_locale); |
| 142 OnLocaleChanged(delegate, cur_locale, from_locale, to_locale)); | |
| 143 } | 146 } |
| 144 | 147 |
| 145 void SystemTrayNotifier::AddUpdateObserver(UpdateObserver* observer) { | 148 void SystemTrayNotifier::AddUpdateObserver(UpdateObserver* observer) { |
| 146 update_observers_.AddObserver(observer); | 149 update_observers_.AddObserver(observer); |
| 147 } | 150 } |
| 148 | 151 |
| 149 void SystemTrayNotifier::RemoveUpdateObserver(UpdateObserver* observer) { | 152 void SystemTrayNotifier::RemoveUpdateObserver(UpdateObserver* observer) { |
| 150 update_observers_.RemoveObserver(observer); | 153 update_observers_.RemoveObserver(observer); |
| 151 } | 154 } |
| 152 | 155 |
| 153 void SystemTrayNotifier::NotifyUpdateRecommended(const UpdateInfo& info) { | 156 void SystemTrayNotifier::NotifyUpdateRecommended(const UpdateInfo& info) { |
| 154 FOR_EACH_OBSERVER(UpdateObserver, update_observers_, | 157 for (auto& observer : update_observers_) |
| 155 OnUpdateRecommended(info)); | 158 observer.OnUpdateRecommended(info); |
| 156 } | 159 } |
| 157 | 160 |
| 158 void SystemTrayNotifier::AddUserObserver(UserObserver* observer) { | 161 void SystemTrayNotifier::AddUserObserver(UserObserver* observer) { |
| 159 user_observers_.AddObserver(observer); | 162 user_observers_.AddObserver(observer); |
| 160 } | 163 } |
| 161 | 164 |
| 162 void SystemTrayNotifier::RemoveUserObserver(UserObserver* observer) { | 165 void SystemTrayNotifier::RemoveUserObserver(UserObserver* observer) { |
| 163 user_observers_.RemoveObserver(observer); | 166 user_observers_.RemoveObserver(observer); |
| 164 } | 167 } |
| 165 | 168 |
| 166 void SystemTrayNotifier::NotifyUserUpdate() { | 169 void SystemTrayNotifier::NotifyUserUpdate() { |
| 167 FOR_EACH_OBSERVER(UserObserver, user_observers_, OnUserUpdate()); | 170 for (auto& observer : user_observers_) |
| 171 observer.OnUserUpdate(); |
| 168 } | 172 } |
| 169 | 173 |
| 170 void SystemTrayNotifier::NotifyUserAddedToSession() { | 174 void SystemTrayNotifier::NotifyUserAddedToSession() { |
| 171 FOR_EACH_OBSERVER(UserObserver, user_observers_, OnUserAddedToSession()); | 175 for (auto& observer : user_observers_) |
| 176 observer.OnUserAddedToSession(); |
| 172 } | 177 } |
| 173 | 178 |
| 174 #if defined(OS_CHROMEOS) | 179 #if defined(OS_CHROMEOS) |
| 175 | 180 |
| 176 void SystemTrayNotifier::AddBluetoothObserver(BluetoothObserver* observer) { | 181 void SystemTrayNotifier::AddBluetoothObserver(BluetoothObserver* observer) { |
| 177 bluetooth_observers_.AddObserver(observer); | 182 bluetooth_observers_.AddObserver(observer); |
| 178 } | 183 } |
| 179 | 184 |
| 180 void SystemTrayNotifier::RemoveBluetoothObserver(BluetoothObserver* observer) { | 185 void SystemTrayNotifier::RemoveBluetoothObserver(BluetoothObserver* observer) { |
| 181 bluetooth_observers_.RemoveObserver(observer); | 186 bluetooth_observers_.RemoveObserver(observer); |
| 182 } | 187 } |
| 183 | 188 |
| 184 void SystemTrayNotifier::NotifyRefreshBluetooth() { | 189 void SystemTrayNotifier::NotifyRefreshBluetooth() { |
| 185 FOR_EACH_OBSERVER(BluetoothObserver, bluetooth_observers_, | 190 for (auto& observer : bluetooth_observers_) |
| 186 OnBluetoothRefresh()); | 191 observer.OnBluetoothRefresh(); |
| 187 } | 192 } |
| 188 | 193 |
| 189 void SystemTrayNotifier::NotifyBluetoothDiscoveringChanged() { | 194 void SystemTrayNotifier::NotifyBluetoothDiscoveringChanged() { |
| 190 FOR_EACH_OBSERVER(BluetoothObserver, bluetooth_observers_, | 195 for (auto& observer : bluetooth_observers_) |
| 191 OnBluetoothDiscoveringChanged()); | 196 observer.OnBluetoothDiscoveringChanged(); |
| 192 } | 197 } |
| 193 | 198 |
| 194 void SystemTrayNotifier::AddEnterpriseDomainObserver( | 199 void SystemTrayNotifier::AddEnterpriseDomainObserver( |
| 195 EnterpriseDomainObserver* observer) { | 200 EnterpriseDomainObserver* observer) { |
| 196 enterprise_domain_observers_.AddObserver(observer); | 201 enterprise_domain_observers_.AddObserver(observer); |
| 197 } | 202 } |
| 198 | 203 |
| 199 void SystemTrayNotifier::RemoveEnterpriseDomainObserver( | 204 void SystemTrayNotifier::RemoveEnterpriseDomainObserver( |
| 200 EnterpriseDomainObserver* observer) { | 205 EnterpriseDomainObserver* observer) { |
| 201 enterprise_domain_observers_.RemoveObserver(observer); | 206 enterprise_domain_observers_.RemoveObserver(observer); |
| 202 } | 207 } |
| 203 | 208 |
| 204 void SystemTrayNotifier::NotifyEnterpriseDomainChanged() { | 209 void SystemTrayNotifier::NotifyEnterpriseDomainChanged() { |
| 205 FOR_EACH_OBSERVER(EnterpriseDomainObserver, enterprise_domain_observers_, | 210 for (auto& observer : enterprise_domain_observers_) |
| 206 OnEnterpriseDomainChanged()); | 211 observer.OnEnterpriseDomainChanged(); |
| 207 } | 212 } |
| 208 | 213 |
| 209 void SystemTrayNotifier::AddLastWindowClosedObserver( | 214 void SystemTrayNotifier::AddLastWindowClosedObserver( |
| 210 LastWindowClosedObserver* observer) { | 215 LastWindowClosedObserver* observer) { |
| 211 last_window_closed_observers_.AddObserver(observer); | 216 last_window_closed_observers_.AddObserver(observer); |
| 212 } | 217 } |
| 213 | 218 |
| 214 void SystemTrayNotifier::RemoveLastWindowClosedObserver( | 219 void SystemTrayNotifier::RemoveLastWindowClosedObserver( |
| 215 LastWindowClosedObserver* observer) { | 220 LastWindowClosedObserver* observer) { |
| 216 last_window_closed_observers_.RemoveObserver(observer); | 221 last_window_closed_observers_.RemoveObserver(observer); |
| 217 } | 222 } |
| 218 | 223 |
| 219 void SystemTrayNotifier::NotifyLastWindowClosed() { | 224 void SystemTrayNotifier::NotifyLastWindowClosed() { |
| 220 FOR_EACH_OBSERVER(LastWindowClosedObserver, last_window_closed_observers_, | 225 for (auto& observer : last_window_closed_observers_) |
| 221 OnLastWindowClosed()); | 226 observer.OnLastWindowClosed(); |
| 222 } | 227 } |
| 223 | 228 |
| 224 void SystemTrayNotifier::AddLogoutButtonObserver( | 229 void SystemTrayNotifier::AddLogoutButtonObserver( |
| 225 LogoutButtonObserver* observer) { | 230 LogoutButtonObserver* observer) { |
| 226 logout_button_observers_.AddObserver(observer); | 231 logout_button_observers_.AddObserver(observer); |
| 227 } | 232 } |
| 228 | 233 |
| 229 void SystemTrayNotifier::RemoveLogoutButtonObserver( | 234 void SystemTrayNotifier::RemoveLogoutButtonObserver( |
| 230 LogoutButtonObserver* observer) { | 235 LogoutButtonObserver* observer) { |
| 231 logout_button_observers_.RemoveObserver(observer); | 236 logout_button_observers_.RemoveObserver(observer); |
| 232 } | 237 } |
| 233 | 238 |
| 234 void SystemTrayNotifier::NotifyShowLoginButtonChanged(bool show_login_button) { | 239 void SystemTrayNotifier::NotifyShowLoginButtonChanged(bool show_login_button) { |
| 235 FOR_EACH_OBSERVER(LogoutButtonObserver, logout_button_observers_, | 240 for (auto& observer : logout_button_observers_) |
| 236 OnShowLogoutButtonInTrayChanged(show_login_button)); | 241 observer.OnShowLogoutButtonInTrayChanged(show_login_button); |
| 237 } | 242 } |
| 238 | 243 |
| 239 void SystemTrayNotifier::NotifyLogoutDialogDurationChanged( | 244 void SystemTrayNotifier::NotifyLogoutDialogDurationChanged( |
| 240 base::TimeDelta duration) { | 245 base::TimeDelta duration) { |
| 241 FOR_EACH_OBSERVER(LogoutButtonObserver, logout_button_observers_, | 246 for (auto& observer : logout_button_observers_) |
| 242 OnLogoutDialogDurationChanged(duration)); | 247 observer.OnLogoutDialogDurationChanged(duration); |
| 243 } | 248 } |
| 244 | 249 |
| 245 void SystemTrayNotifier::AddMediaCaptureObserver( | 250 void SystemTrayNotifier::AddMediaCaptureObserver( |
| 246 MediaCaptureObserver* observer) { | 251 MediaCaptureObserver* observer) { |
| 247 media_capture_observers_.AddObserver(observer); | 252 media_capture_observers_.AddObserver(observer); |
| 248 } | 253 } |
| 249 | 254 |
| 250 void SystemTrayNotifier::RemoveMediaCaptureObserver( | 255 void SystemTrayNotifier::RemoveMediaCaptureObserver( |
| 251 MediaCaptureObserver* observer) { | 256 MediaCaptureObserver* observer) { |
| 252 media_capture_observers_.RemoveObserver(observer); | 257 media_capture_observers_.RemoveObserver(observer); |
| 253 } | 258 } |
| 254 | 259 |
| 255 void SystemTrayNotifier::NotifyMediaCaptureChanged() { | 260 void SystemTrayNotifier::NotifyMediaCaptureChanged() { |
| 256 FOR_EACH_OBSERVER(MediaCaptureObserver, media_capture_observers_, | 261 for (auto& observer : media_capture_observers_) |
| 257 OnMediaCaptureChanged()); | 262 observer.OnMediaCaptureChanged(); |
| 258 } | 263 } |
| 259 | 264 |
| 260 void SystemTrayNotifier::AddNetworkObserver(NetworkObserver* observer) { | 265 void SystemTrayNotifier::AddNetworkObserver(NetworkObserver* observer) { |
| 261 network_observers_.AddObserver(observer); | 266 network_observers_.AddObserver(observer); |
| 262 } | 267 } |
| 263 | 268 |
| 264 void SystemTrayNotifier::RemoveNetworkObserver(NetworkObserver* observer) { | 269 void SystemTrayNotifier::RemoveNetworkObserver(NetworkObserver* observer) { |
| 265 network_observers_.RemoveObserver(observer); | 270 network_observers_.RemoveObserver(observer); |
| 266 } | 271 } |
| 267 | 272 |
| 268 void SystemTrayNotifier::NotifyRequestToggleWifi() { | 273 void SystemTrayNotifier::NotifyRequestToggleWifi() { |
| 269 FOR_EACH_OBSERVER(NetworkObserver, network_observers_, RequestToggleWifi()); | 274 for (auto& observer : network_observers_) |
| 275 observer.RequestToggleWifi(); |
| 270 } | 276 } |
| 271 | 277 |
| 272 void SystemTrayNotifier::AddNetworkPortalDetectorObserver( | 278 void SystemTrayNotifier::AddNetworkPortalDetectorObserver( |
| 273 NetworkPortalDetectorObserver* observer) { | 279 NetworkPortalDetectorObserver* observer) { |
| 274 network_portal_detector_observers_.AddObserver(observer); | 280 network_portal_detector_observers_.AddObserver(observer); |
| 275 } | 281 } |
| 276 | 282 |
| 277 void SystemTrayNotifier::RemoveNetworkPortalDetectorObserver( | 283 void SystemTrayNotifier::RemoveNetworkPortalDetectorObserver( |
| 278 NetworkPortalDetectorObserver* observer) { | 284 NetworkPortalDetectorObserver* observer) { |
| 279 network_portal_detector_observers_.RemoveObserver(observer); | 285 network_portal_detector_observers_.RemoveObserver(observer); |
| 280 } | 286 } |
| 281 | 287 |
| 282 void SystemTrayNotifier::NotifyOnCaptivePortalDetected( | 288 void SystemTrayNotifier::NotifyOnCaptivePortalDetected( |
| 283 const std::string& service_path) { | 289 const std::string& service_path) { |
| 284 FOR_EACH_OBSERVER(NetworkPortalDetectorObserver, | 290 for (auto& observer : network_portal_detector_observers_) |
| 285 network_portal_detector_observers_, | 291 observer.OnCaptivePortalDetected(service_path); |
| 286 OnCaptivePortalDetected(service_path)); | |
| 287 } | 292 } |
| 288 | 293 |
| 289 void SystemTrayNotifier::AddScreenCaptureObserver( | 294 void SystemTrayNotifier::AddScreenCaptureObserver( |
| 290 ScreenCaptureObserver* observer) { | 295 ScreenCaptureObserver* observer) { |
| 291 screen_capture_observers_.AddObserver(observer); | 296 screen_capture_observers_.AddObserver(observer); |
| 292 } | 297 } |
| 293 | 298 |
| 294 void SystemTrayNotifier::RemoveScreenCaptureObserver( | 299 void SystemTrayNotifier::RemoveScreenCaptureObserver( |
| 295 ScreenCaptureObserver* observer) { | 300 ScreenCaptureObserver* observer) { |
| 296 screen_capture_observers_.RemoveObserver(observer); | 301 screen_capture_observers_.RemoveObserver(observer); |
| 297 } | 302 } |
| 298 | 303 |
| 299 void SystemTrayNotifier::NotifyScreenCaptureStart( | 304 void SystemTrayNotifier::NotifyScreenCaptureStart( |
| 300 const base::Closure& stop_callback, | 305 const base::Closure& stop_callback, |
| 301 const base::string16& sharing_app_name) { | 306 const base::string16& sharing_app_name) { |
| 302 FOR_EACH_OBSERVER(ScreenCaptureObserver, screen_capture_observers_, | 307 for (auto& observer : screen_capture_observers_) |
| 303 OnScreenCaptureStart(stop_callback, sharing_app_name)); | 308 observer.OnScreenCaptureStart(stop_callback, sharing_app_name); |
| 304 } | 309 } |
| 305 | 310 |
| 306 void SystemTrayNotifier::NotifyScreenCaptureStop() { | 311 void SystemTrayNotifier::NotifyScreenCaptureStop() { |
| 307 FOR_EACH_OBSERVER(ScreenCaptureObserver, screen_capture_observers_, | 312 for (auto& observer : screen_capture_observers_) |
| 308 OnScreenCaptureStop()); | 313 observer.OnScreenCaptureStop(); |
| 309 } | 314 } |
| 310 | 315 |
| 311 void SystemTrayNotifier::AddScreenShareObserver(ScreenShareObserver* observer) { | 316 void SystemTrayNotifier::AddScreenShareObserver(ScreenShareObserver* observer) { |
| 312 screen_share_observers_.AddObserver(observer); | 317 screen_share_observers_.AddObserver(observer); |
| 313 } | 318 } |
| 314 | 319 |
| 315 void SystemTrayNotifier::RemoveScreenShareObserver( | 320 void SystemTrayNotifier::RemoveScreenShareObserver( |
| 316 ScreenShareObserver* observer) { | 321 ScreenShareObserver* observer) { |
| 317 screen_share_observers_.RemoveObserver(observer); | 322 screen_share_observers_.RemoveObserver(observer); |
| 318 } | 323 } |
| 319 | 324 |
| 320 void SystemTrayNotifier::NotifyScreenShareStart( | 325 void SystemTrayNotifier::NotifyScreenShareStart( |
| 321 const base::Closure& stop_callback, | 326 const base::Closure& stop_callback, |
| 322 const base::string16& helper_name) { | 327 const base::string16& helper_name) { |
| 323 FOR_EACH_OBSERVER(ScreenShareObserver, screen_share_observers_, | 328 for (auto& observer : screen_share_observers_) |
| 324 OnScreenShareStart(stop_callback, helper_name)); | 329 observer.OnScreenShareStart(stop_callback, helper_name); |
| 325 } | 330 } |
| 326 | 331 |
| 327 void SystemTrayNotifier::NotifyScreenShareStop() { | 332 void SystemTrayNotifier::NotifyScreenShareStop() { |
| 328 FOR_EACH_OBSERVER(ScreenShareObserver, screen_share_observers_, | 333 for (auto& observer : screen_share_observers_) |
| 329 OnScreenShareStop()); | 334 observer.OnScreenShareStop(); |
| 330 } | 335 } |
| 331 | 336 |
| 332 void SystemTrayNotifier::AddSessionLengthLimitObserver( | 337 void SystemTrayNotifier::AddSessionLengthLimitObserver( |
| 333 SessionLengthLimitObserver* observer) { | 338 SessionLengthLimitObserver* observer) { |
| 334 session_length_limit_observers_.AddObserver(observer); | 339 session_length_limit_observers_.AddObserver(observer); |
| 335 } | 340 } |
| 336 | 341 |
| 337 void SystemTrayNotifier::RemoveSessionLengthLimitObserver( | 342 void SystemTrayNotifier::RemoveSessionLengthLimitObserver( |
| 338 SessionLengthLimitObserver* observer) { | 343 SessionLengthLimitObserver* observer) { |
| 339 session_length_limit_observers_.RemoveObserver(observer); | 344 session_length_limit_observers_.RemoveObserver(observer); |
| 340 } | 345 } |
| 341 | 346 |
| 342 void SystemTrayNotifier::NotifySessionStartTimeChanged() { | 347 void SystemTrayNotifier::NotifySessionStartTimeChanged() { |
| 343 FOR_EACH_OBSERVER(SessionLengthLimitObserver, session_length_limit_observers_, | 348 for (auto& observer : session_length_limit_observers_) |
| 344 OnSessionStartTimeChanged()); | 349 observer.OnSessionStartTimeChanged(); |
| 345 } | 350 } |
| 346 | 351 |
| 347 void SystemTrayNotifier::NotifySessionLengthLimitChanged() { | 352 void SystemTrayNotifier::NotifySessionLengthLimitChanged() { |
| 348 FOR_EACH_OBSERVER(SessionLengthLimitObserver, session_length_limit_observers_, | 353 for (auto& observer : session_length_limit_observers_) |
| 349 OnSessionLengthLimitChanged()); | 354 observer.OnSessionLengthLimitChanged(); |
| 350 } | 355 } |
| 351 | 356 |
| 352 void SystemTrayNotifier::AddTracingObserver(TracingObserver* observer) { | 357 void SystemTrayNotifier::AddTracingObserver(TracingObserver* observer) { |
| 353 tracing_observers_.AddObserver(observer); | 358 tracing_observers_.AddObserver(observer); |
| 354 } | 359 } |
| 355 | 360 |
| 356 void SystemTrayNotifier::RemoveTracingObserver(TracingObserver* observer) { | 361 void SystemTrayNotifier::RemoveTracingObserver(TracingObserver* observer) { |
| 357 tracing_observers_.RemoveObserver(observer); | 362 tracing_observers_.RemoveObserver(observer); |
| 358 } | 363 } |
| 359 | 364 |
| 360 void SystemTrayNotifier::NotifyTracingModeChanged(bool value) { | 365 void SystemTrayNotifier::NotifyTracingModeChanged(bool value) { |
| 361 FOR_EACH_OBSERVER(TracingObserver, tracing_observers_, | 366 for (auto& observer : tracing_observers_) |
| 362 OnTracingModeChanged(value)); | 367 observer.OnTracingModeChanged(value); |
| 363 } | 368 } |
| 364 | 369 |
| 365 void SystemTrayNotifier::AddVirtualKeyboardObserver( | 370 void SystemTrayNotifier::AddVirtualKeyboardObserver( |
| 366 VirtualKeyboardObserver* observer) { | 371 VirtualKeyboardObserver* observer) { |
| 367 virtual_keyboard_observers_.AddObserver(observer); | 372 virtual_keyboard_observers_.AddObserver(observer); |
| 368 } | 373 } |
| 369 | 374 |
| 370 void SystemTrayNotifier::RemoveVirtualKeyboardObserver( | 375 void SystemTrayNotifier::RemoveVirtualKeyboardObserver( |
| 371 VirtualKeyboardObserver* observer) { | 376 VirtualKeyboardObserver* observer) { |
| 372 virtual_keyboard_observers_.RemoveObserver(observer); | 377 virtual_keyboard_observers_.RemoveObserver(observer); |
| 373 } | 378 } |
| 374 | 379 |
| 375 void SystemTrayNotifier::NotifyVirtualKeyboardSuppressionChanged( | 380 void SystemTrayNotifier::NotifyVirtualKeyboardSuppressionChanged( |
| 376 bool suppressed) { | 381 bool suppressed) { |
| 377 FOR_EACH_OBSERVER(VirtualKeyboardObserver, virtual_keyboard_observers_, | 382 for (auto& observer : virtual_keyboard_observers_) |
| 378 OnKeyboardSuppressionChanged(suppressed)); | 383 observer.OnKeyboardSuppressionChanged(suppressed); |
| 379 } | 384 } |
| 380 | 385 |
| 381 #endif // defined(OS_CHROMEOS) | 386 #endif // defined(OS_CHROMEOS) |
| 382 | 387 |
| 383 } // namespace ash | 388 } // namespace ash |
| OLD | NEW |