mirror of
https://github.com/electron/electron.git
synced 2026-04-10 03:01:51 -04:00
refactor: use base::ObserverList::Notify() (#46875)
* refactor: use ObserverList::Notify() in shell/browser/window_list.cc * refactor: use ObserverList::Notify() in shell/browser/web_contents_zoom_controller.cc * refactor: use ObserverList::Notify() in shell/browser/usb/usb_chooser_context.cc * refactor: use ObserverList::Notify() in shell/browser/usb/electron_usb_delegate.cc * refactor: use ObserverList::Notify() in shell/browser/ui/views/menu_delegate.cc * refactor: use ObserverList::Notify() in shell/browser/ui/tray_icon.cc * refactor: use ObserverList::Notify() in shell/browser/ui/electron_menu_model.cc * refactor: use ObserverList::Notify() in shell/browser/serial/serial_chooser_context.cc * refactor: use ObserverList::Notify() in shell/browser/native_window.cc * refactor: use ObserverList::Notify() in shell/browser/serial/electron_serial_delegate.cc * refactor: use ObserverList::Notify() in shell/browser/browser.cc * refactor: use ObserverList::Notify() in shell/browser/api/electron_api_web_contents.cc * refactor: use ObserverList::Notify() in shell/browser/hid/electron_hid_delegate.cc * refactor: use ObserverList::Notify() in shell/browser/hid/hid_chooser_context.cc
This commit is contained in:
@@ -56,25 +56,25 @@ class ElectronHidDelegate::ContextObservation
|
||||
|
||||
// HidChooserContext::DeviceObserver:
|
||||
void OnDeviceAdded(const device::mojom::HidDeviceInfo& device_info) override {
|
||||
for (auto& observer : observer_list_)
|
||||
observer.OnDeviceAdded(device_info);
|
||||
observer_list_.Notify(&content::HidDelegate::Observer::OnDeviceAdded,
|
||||
device_info);
|
||||
}
|
||||
|
||||
void OnDeviceRemoved(
|
||||
const device::mojom::HidDeviceInfo& device_info) override {
|
||||
for (auto& observer : observer_list_)
|
||||
observer.OnDeviceRemoved(device_info);
|
||||
observer_list_.Notify(&content::HidDelegate::Observer::OnDeviceRemoved,
|
||||
device_info);
|
||||
}
|
||||
|
||||
void OnDeviceChanged(
|
||||
const device::mojom::HidDeviceInfo& device_info) override {
|
||||
for (auto& observer : observer_list_)
|
||||
observer.OnDeviceChanged(device_info);
|
||||
observer_list_.Notify(&content::HidDelegate::Observer::OnDeviceChanged,
|
||||
device_info);
|
||||
}
|
||||
|
||||
void OnHidManagerConnectionError() override {
|
||||
for (auto& observer : observer_list_)
|
||||
observer.OnHidManagerConnectionError();
|
||||
observer_list_.Notify(
|
||||
&content::HidDelegate::Observer::OnHidManagerConnectionError);
|
||||
}
|
||||
|
||||
void OnHidChooserContextShutdown() override {
|
||||
|
||||
@@ -244,8 +244,7 @@ void HidChooserContext::DeviceAdded(device::mojom::HidDeviceInfoPtr device) {
|
||||
devices_.insert({device->guid, device->Clone()});
|
||||
|
||||
// Notify all observers.
|
||||
for (auto& observer : device_observer_list_)
|
||||
observer.OnDeviceAdded(*device);
|
||||
device_observer_list_.Notify(&DeviceObserver::OnDeviceAdded, *device);
|
||||
}
|
||||
|
||||
void HidChooserContext::DeviceRemoved(device::mojom::HidDeviceInfoPtr device) {
|
||||
@@ -256,8 +255,7 @@ void HidChooserContext::DeviceRemoved(device::mojom::HidDeviceInfoPtr device) {
|
||||
DCHECK_EQ(n_erased, 1U);
|
||||
|
||||
// Notify all device observers.
|
||||
for (auto& observer : device_observer_list_)
|
||||
observer.OnDeviceRemoved(*device);
|
||||
device_observer_list_.Notify(&DeviceObserver::OnDeviceRemoved, *device);
|
||||
|
||||
// Next we'll notify observers for revoked permissions. If the device does not
|
||||
// support persistent permissions then device permissions are revoked on
|
||||
@@ -278,8 +276,7 @@ void HidChooserContext::DeviceChanged(device::mojom::HidDeviceInfoPtr device) {
|
||||
mapped = device->Clone();
|
||||
|
||||
// Notify all observers.
|
||||
for (auto& observer : device_observer_list_)
|
||||
observer.OnDeviceChanged(*device);
|
||||
device_observer_list_.Notify(&DeviceObserver::OnDeviceChanged, *device);
|
||||
}
|
||||
|
||||
void HidChooserContext::EnsureHidManagerConnection() {
|
||||
@@ -329,8 +326,7 @@ void HidChooserContext::OnHidManagerConnectionError() {
|
||||
ephemeral_devices_.clear();
|
||||
|
||||
// Notify all device observers.
|
||||
for (auto& observer : device_observer_list_)
|
||||
observer.OnHidManagerConnectionError();
|
||||
device_observer_list_.Notify(&DeviceObserver::OnHidManagerConnectionError);
|
||||
}
|
||||
|
||||
} // namespace electron
|
||||
|
||||
Reference in New Issue
Block a user