mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

refactor: use base::ObserverList::Notify() (#46897)

Browse source 
* refactor: use ObserverList::Notify() in shell/browser/window_list.cc

Co-authored-by: Charles Kerr <charles@charleskerr.com>

* refactor: use ObserverList::Notify() in shell/browser/web_contents_zoom_controller.cc

Co-authored-by: Charles Kerr <charles@charleskerr.com>

* refactor: use ObserverList::Notify() in shell/browser/usb/usb_chooser_context.cc

Co-authored-by: Charles Kerr <charles@charleskerr.com>

* refactor: use ObserverList::Notify() in shell/browser/usb/electron_usb_delegate.cc

Co-authored-by: Charles Kerr <charles@charleskerr.com>

* refactor: use ObserverList::Notify() in shell/browser/ui/views/menu_delegate.cc

Co-authored-by: Charles Kerr <charles@charleskerr.com>

* refactor: use ObserverList::Notify() in shell/browser/ui/tray_icon.cc

Co-authored-by: Charles Kerr <charles@charleskerr.com>

* refactor: use ObserverList::Notify() in shell/browser/ui/electron_menu_model.cc

Co-authored-by: Charles Kerr <charles@charleskerr.com>

* refactor: use ObserverList::Notify() in shell/browser/serial/serial_chooser_context.cc

Co-authored-by: Charles Kerr <charles@charleskerr.com>

* refactor: use ObserverList::Notify() in shell/browser/native_window.cc

Co-authored-by: Charles Kerr <charles@charleskerr.com>

* refactor: use ObserverList::Notify() in shell/browser/serial/electron_serial_delegate.cc

Co-authored-by: Charles Kerr <charles@charleskerr.com>

* refactor: use ObserverList::Notify() in shell/browser/browser.cc

Co-authored-by: Charles Kerr <charles@charleskerr.com>

* refactor: use ObserverList::Notify() in shell/browser/api/electron_api_web_contents.cc

Co-authored-by: Charles Kerr <charles@charleskerr.com>

* refactor: use ObserverList::Notify() in shell/browser/hid/electron_hid_delegate.cc

Co-authored-by: Charles Kerr <charles@charleskerr.com>

* refactor: use ObserverList::Notify() in shell/browser/hid/hid_chooser_context.cc

Co-authored-by: Charles Kerr <charles@charleskerr.com>

---------

Co-authored-by: trop[bot] <37223003+trop[bot]@users.noreply.github.com>
Co-authored-by: Charles Kerr <charles@charleskerr.com>
This commit is contained in:
trop[bot] 2025-05-02 07:51:05 -05:00 • committed by GitHub
parent 1687b95849
commit 17e1ff2675
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
14 changed files with 134 additions and 229 deletions
Download patch file Download diff file Expand all files Collapse all files

35
shell/browser/web_contents_zoom_controller.cc
View file

@ -48,9 +48,7 @@ WebContentsZoomController::WebContentsZoomController(
WebContentsZoomController::~WebContentsZoomController() {
DCHECK_CURRENTLY_ON(BrowserThread::UI);
for (auto& observer : observers_) {
observer.OnZoomControllerDestroyed(this);
}
observers_.Notify(&WebContentsZoomObserver::OnZoomControllerDestroyed, this);
}
void WebContentsZoomController::AddObserver(WebContentsZoomObserver* observer) {
@ -90,8 +88,8 @@ bool WebContentsZoomController::SetZoomLevel(double level) {
ZoomChangedEventData zoom_change_data(web_contents(), old_zoom_level,
zoom_level_, true /* temporary */,
zoom_mode_);
for (auto& observer : observers_)
observer.OnZoomChanged(zoom_change_data);
observers_.Notify(&WebContentsZoomObserver::OnZoomChanged,
zoom_change_data);
return true;
}
@ -110,8 +108,8 @@ bool WebContentsZoomController::SetZoomLevel(double level) {
zoom_map->SetTemporaryZoomLevel(rfh_id, level);
ZoomChangedEventData zoom_change_data(web_contents(), zoom_level_, level,
true /* temporary */, zoom_mode_);
for (auto& observer : observers_)
observer.OnZoomChanged(zoom_change_data);
observers_.Notify(&WebContentsZoomObserver::OnZoomChanged,
zoom_change_data);
} else {
const GURL url = content::HostZoomMap::GetURLForRenderFrameHost(rfh_id);
if (url.is_empty()) {
@ -148,8 +146,7 @@ void WebContentsZoomController::SetTemporaryZoomLevel(double level) {
// Notify observers of zoom level changes.
ZoomChangedEventData zoom_change_data(web_contents(), zoom_level_, level,
true /* temporary */, zoom_mode_);
for (auto& observer : observers_)
observer.OnZoomChanged(zoom_change_data);
observers_.Notify(&WebContentsZoomObserver::OnZoomChanged, zoom_change_data);
}
bool WebContentsZoomController::UsesTemporaryZoomLevel() {
@ -213,8 +210,8 @@ void WebContentsZoomController::SetZoomMode(ZoomMode new_mode) {
} else {
// When we don't call any HostZoomMap set functions, we send the event
// manually.
for (auto& observer : observers_)
observer.OnZoomChanged(*event_data_);
observers_.Notify(&WebContentsZoomObserver::OnZoomChanged,
*event_data_);
event_data_.reset();
}
break;
@ -229,8 +226,8 @@ void WebContentsZoomController::SetZoomMode(ZoomMode new_mode) {
} else {
// When we don't call any HostZoomMap set functions, we send the event
// manually.
for (auto& observer : observers_)
observer.OnZoomChanged(*event_data_);
observers_.Notify(&WebContentsZoomObserver::OnZoomChanged,
*event_data_);
event_data_.reset();
}
break;
@ -303,9 +300,7 @@ void WebContentsZoomController::WebContentsDestroyed() {
DCHECK_CURRENTLY_ON(BrowserThread::UI);
// At this point we should no longer be sending any zoom events with this
// WebContents.
for (auto& observer : observers_) {
observer.OnZoomControllerDestroyed(this);
}
observers_.Notify(&WebContentsZoomObserver::OnZoomControllerDestroyed, this);
embedder_zoom_controller_ = nullptr;
}
@ -389,14 +384,14 @@ void WebContentsZoomController::UpdateState(const std::string& host) {
// the change should be sent.
ZoomChangedEventData zoom_change_data = *event_data_;
event_data_.reset();
for (auto& observer : observers_)
observer.OnZoomChanged(zoom_change_data);
observers_.Notify(&WebContentsZoomObserver::OnZoomChanged,
zoom_change_data);
} else {
double zoom_level = GetZoomLevel();
ZoomChangedEventData zoom_change_data(web_contents(), zoom_level,
zoom_level, false, zoom_mode_);
for (auto& observer : observers_)
observer.OnZoomChanged(zoom_change_data);
observers_.Notify(&WebContentsZoomObserver::OnZoomChanged,
zoom_change_data);
}
}