chromium/src
0
Fork 0
Code Activity

Give empty implementations for views::FocusChangeListener methods

Browse Source 
Most subclass of views::FocusChangeListener have to implements all the
methods by given empty implementations when they do not need it.

This CL gives empty implementations for views::FocusChangeListener
methods so that they do not have to be re-implemented by every subclass.

The subclass will only have to re-implement what they need.

The change in most of the files consist to remove the empty implementation from them.

Bug: 366010430
Change-Id: I59b4d528c9f96265f38e3c6faf312cd9e8e2aef8
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6388184
Reviewed-by: Denis Kuznetsov <antrim@chromium.org>
Reviewed-by: Colin Blundell <blundell@chromium.org>
Commit-Queue: Daniel Soromou <koretadaniel@chromium.org>
Reviewed-by: Tom Lukaszewicz <tluk@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1438087}
This commit is contained in:
Foromo Daniel Soromou
2025-03-26 07:08:14 -07:00
committed by Chromium LUCI CQ
parent 29b6048dd8
commit 2e2a743816
37 changed files with 3 additions and 73 deletions

3
ash/accessibility/ui/native_focus_watcher.cc

@ -112,9 +112,6 @@ void NativeFocusWatcher::OnNativeFocusChanged(gfx::NativeView focused_now) {
SetWidget(widget);
}
void NativeFocusWatcher::OnWillChangeFocus(views::View* focused_before,
views::View* focused_now) {}
void NativeFocusWatcher::OnDidChangeFocus(views::View* focused_before,
views::View* focused_now) {
DCHECK_EQ(focused_now, widget_->GetFocusManager()->GetFocusedView());

2
ash/accessibility/ui/native_focus_watcher.h

@ -57,8 +57,6 @@ class NativeFocusWatcher : public views::WidgetFocusChangeListener,
void OnNativeFocusChanged(gfx::NativeView focused_now) override;
// views::FocusChangeListener:
void OnWillChangeFocus(views::View* focused_before,
views::View* focused_now) override;
void OnDidChangeFocus(views::View* focused_before,
views::View* focused_now) override;

2
ash/app_list/test/test_focus_change_listener.h

@ -19,8 +19,6 @@ class TestFocusChangeListener : public views::FocusChangeListener {
~TestFocusChangeListener() override;
// views::FocusChangeListener:
void OnWillChangeFocus(views::View* focused_before,
views::View* focused_now) override {}
void OnDidChangeFocus(views::View* focused_before,
views::View* focused_now) override;

1
ash/app_list/views/apps_container_view.h

@ -123,7 +123,6 @@ class ASH_EXPORT AppsContainerView
DropCallback GetDropCallback(const ui::DropTargetEvent& event) override;
// views::FocusChangeListener overrides:
void OnWillChangeFocus(View* focused_before, View* focused_now) override {}
void OnDidChangeFocus(View* focused_before, View* focused_now) override;
// AppListPage overrides:

3
ash/app_list/views/assistant/assistant_page_view_unittest.cc

@ -106,9 +106,6 @@ class FocusChangeListenerStub : public views::FocusChangeListener {
focus_manager_->RemoveFocusChangeListener(this);
}
void OnWillChangeFocus(views::View* focused_before,
views::View* focused_now) override {}
void OnDidChangeFocus(views::View* focused_before,
views::View* focused_now) override {
focused_views_.push_back(focused_now);

2
ash/app_list/views/continue_section_view.h

@ -81,8 +81,6 @@ class ASH_EXPORT ContinueSectionView : public views::View,
void RemovedFromWidget() override;
// views::FocusChangeListener:
void OnWillChangeFocus(views::View* focused_before,
views::View* focused_now) override {}
void OnDidChangeFocus(views::View* focused_before,
views::View* focused_now) override;

3
ash/capture_mode/search_results_panel.cc

@ -386,9 +386,6 @@ void SearchResultsPanel::OnDisplayMetricsChanged(
RefreshPanelBounds();
}
void SearchResultsPanel::OnWillChangeFocus(View* focused_before,
View* focused_now) {}
void SearchResultsPanel::OnDidChangeFocus(View* focused_before,
View* focused_now) {
// Update the focus ring of the previously focused view, if available.

1
ash/capture_mode/search_results_panel.h

@ -80,7 +80,6 @@ class ASH_EXPORT SearchResultsPanel : public SystemPanelView,
uint32_t metrics) override;
// views::FocusChangeListener:
void OnWillChangeFocus(View* focused_before, View* focused_now) override;
void OnDidChangeFocus(View* focused_before, View* focused_now) override;
private:

3
ash/login/ui/lock_contents_view.cc

@ -1586,9 +1586,6 @@ bool LockContentsView::AreMediaControlsEnabled() const {
Shell::Get()->media_controller()->AreLockScreenMediaKeysEnabled();
}
void LockContentsView::OnWillChangeFocus(View* focused_before,
View* focused_now) {}
void LockContentsView::OnDidChangeFocus(View* focused_before,
View* focused_now) {
if (!focused_before || !focused_now) {

1
ash/login/ui/lock_contents_view.h

@ -217,7 +217,6 @@ class ASH_EXPORT LockContentsView
void HideMediaView();
bool AreMediaControlsEnabled() const;
void OnWillChangeFocus(View* focused_before, View* focused_now) override;
void OnDidChangeFocus(View* focused_before, View* focused_now) override;
private:

3
ash/quick_insert/views/quick_insert_search_field_view.cc

@ -164,9 +164,6 @@ bool QuickInsertSearchFieldView::HandleKeyEvent(views::Textfield* sender,
return key_event_handler_->HandleKeyEvent(key_event);
}
void QuickInsertSearchFieldView::OnWillChangeFocus(View* focused_before,
View* focused_now) {}
void QuickInsertSearchFieldView::OnDidChangeFocus(View* focused_before,
View* focused_now) {
if (focused_now == textfield_) {

1
ash/quick_insert/views/quick_insert_search_field_view.h

@ -77,7 +77,6 @@ class ASH_EXPORT QuickInsertSearchFieldView
const ui::KeyEvent& key_event) override;
// views::FocusChangeListener:
void OnWillChangeFocus(View* focused_before, View* focused_now) override;
void OnDidChangeFocus(View* focused_before, View* focused_now) override;
// Should be called every time the contents of the text field changes, even

2
ash/system/time/calendar_view_unittest.cc

@ -793,8 +793,6 @@ class DateCellFocusChangeListener : public views::FocusChangeListener {
bool found() const { return found_; }
// views::FocusChangeListener:
void OnWillChangeFocus(views::View* focused_before,
views::View* focused_now) override {}
void OnDidChangeFocus(views::View* focused_before,
views::View* focused_now) override {
if (found_) {

3
ash/system/unified/feature_tiles_container_view.cc

@ -284,9 +284,6 @@ void FeatureTilesContainerView::RemovedFromWidget() {
GetFocusManager()->RemoveFocusChangeListener(this);
}
void FeatureTilesContainerView::OnWillChangeFocus(views::View* before,
views::View* now) {}
void FeatureTilesContainerView::OnDidChangeFocus(views::View* before,
views::View* now) {
if (!now || !views::IsViewClass<FeatureTile>(now) || !Contains(now)) {

1
ash/system/unified/feature_tiles_container_view.h

@ -63,7 +63,6 @@ class ASH_EXPORT FeatureTilesContainerView : public views::View,
void RemovedFromWidget() override;
// views::FocusChangeListener:
void OnWillChangeFocus(views::View* before, views::View* now) override;
void OnDidChangeFocus(views::View* before, views::View* now) override;
// Returns the number of children that are visible.

2
chrome/browser/ui/browser_focus_uitest.cc

@ -89,8 +89,6 @@ class FocusChangeObserver : public views::FocusChangeListener,
void WaitForFocusChange() { run_loop_.Run(); }
// FocusChangeListener:
void OnWillChangeFocus(views::View* focused_before,
views::View* focused_now) override {}
void OnDidChangeFocus(views::View* focused_before,
views::View* focused_now) override {
if (focused_now) {

3
chrome/browser/ui/lens/lens_overlay_entry_point_controller.cc

@ -233,9 +233,6 @@ void LensOverlayEntryPointController::OnViewRemovedFromWidget(
location_bar_->GetFocusManager()->RemoveFocusChangeListener(this);
}
void LensOverlayEntryPointController::OnWillChangeFocus(views::View* before,
views::View* now) {}
void LensOverlayEntryPointController::OnDidChangeFocus(views::View* before,
views::View* now) {
UpdatePageActionState();

1
chrome/browser/ui/lens/lens_overlay_entry_point_controller.h

@ -77,7 +77,6 @@ class LensOverlayEntryPointController : public FullscreenObserver,
void OnTemplateURLServiceShuttingDown() override;
// views::FocusChangeListener
void OnWillChangeFocus(views::View* before, views::View* now) override;
void OnDidChangeFocus(views::View* before, views::View* now) override;
// views::ViewObserver

1
chrome/browser/ui/views/autofill/popup/popup_search_bar_view.h

@ -73,7 +73,6 @@ class PopupSearchBarView : public views::View,
void RemovedFromWidget() override;
// views::FocusChangeListener:
void OnWillChangeFocus(View* focused_before, View* focused_now) override {}
void OnDidChangeFocus(View* focused_before, View* focused_now) override;
// views::TextfieldController:

1
chrome/browser/ui/views/download/bubble/download_bubble_partial_view.h

@ -44,7 +44,6 @@ class DownloadBubblePartialView : public DownloadBubblePrimaryView,
// views::FocusChangeListener:
void OnWillChangeFocus(views::View* before, views::View* now) override;
void OnDidChangeFocus(views::View* before, views::View* now) override {}
private:
// Run the |on_interacted_closure_|.

1
chrome/browser/ui/views/download/bubble/download_bubble_row_view.h

@ -77,7 +77,6 @@ class DownloadBubbleRowView : public views::View,
// Overrides views::FocusChangeListener
void OnWillChangeFocus(views::View* before, views::View* now) override;
void OnDidChangeFocus(views::View* before, views::View* now) override {}
// Update the row and its elements for hover and focus events.
void UpdateRowForHover(bool hovered);

3
chrome/browser/ui/views/find_bar_host.cc

@ -688,9 +688,6 @@ void FindBarHost::OnWillChangeFocus(views::View* focused_before,
}
}
void FindBarHost::OnDidChangeFocus(views::View* focused_before,
views::View* focused_now) {}
void FindBarHost::AnimationProgressed(const gfx::Animation* animation) {
// First, we calculate how many pixels to slide the widget.
gfx::Size pref_size = view_->GetPreferredSize();

2
chrome/browser/ui/views/find_bar_host.h

@ -170,8 +170,6 @@ class FindBarHost : public FindBar,
// views::FocusChangeListener:
void OnWillChangeFocus(views::View* focused_before,
views::View* focused_now) override;
void OnDidChangeFocus(views::View* focused_before,
views::View* focused_now) override;
// views::AnimationDelegateViews:
void AnimationProgressed(const gfx::Animation* animation) override;

2
chrome/browser/ui/views/frame/browser_view_focus_uitest.cc

@ -122,8 +122,6 @@ class FocusedViewClassRecorder : public views::FocusChangeListener {
private:
// Inherited from views::FocusChangeListener
void OnWillChangeFocus(views::View* focused_before,
views::View* focused_now) override {}
void OnDidChangeFocus(views::View* focused_before,
views::View* focused_now) override {
if (focused_now) {

2
chrome/browser/ui/views/frame/immersive_mode_controller_mac.h

@ -98,8 +98,6 @@ class ImmersiveModeControllerMac : public ImmersiveModeController,
void SetTabNativeWidgetID(uint64_t widget_id);
// views::FocusChangeListener implementation.
void OnWillChangeFocus(views::View* focused_before,
views::View* focused_now) override;
void OnDidChangeFocus(views::View* focused_before,
views::View* focused_now) override;

3
chrome/browser/ui/views/frame/immersive_mode_controller_mac.mm

@ -331,9 +331,6 @@ void ImmersiveModeControllerMac::OnContentFullscreenChanged(
}
}
void ImmersiveModeControllerMac::OnWillChangeFocus(views::View* focused_before,
views::View* focused_now) {}
void ImmersiveModeControllerMac::OnDidChangeFocus(views::View* focused_before,
views::View* focused_now) {
if (browser_view_->top_container()->Contains(focused_now) ||

3
chrome/browser/ui/views/keyboard_access_interactive_uitest.cc

@ -64,9 +64,6 @@ class ViewFocusChangeWaiter : public views::FocusChangeListener {
private:
// views::FocusChangeListener:
void OnWillChangeFocus(views::View* focused_before,
views::View* focused_now) override {}
void OnDidChangeFocus(views::View* focused_before,
views::View* focused_now) override {
if (focused_now && focused_now->GetID() != previous_view_id_) {

3
chrome/browser/ui/views/location_bar/location_bar_view.cc

@ -575,9 +575,6 @@ void LocationBarView::RemovedFromWidget() {
}
}
void LocationBarView::OnWillChangeFocus(views::View* before, views::View* now) {
}
void LocationBarView::OnDidChangeFocus(views::View* before, views::View* now) {
// TODO(crbug.com/376283383): Remove this once Lens Overlay is migrated to the
// new page actions design.

1
chrome/browser/ui/views/location_bar/location_bar_view.h

@ -230,7 +230,6 @@ class LocationBarView
void ChildPreferredSizeChanged(views::View* child) override;
// views::FocusChangeListener:
void OnWillChangeFocus(views::View* before, views::View* now) override;
void OnDidChangeFocus(views::View* before, views::View* now) override;
// IconLabelBubbleView::Delegate:

1
chrome/browser/ui/views/performance_controls/tab_list_row_view.h

@ -48,7 +48,6 @@ class TabListRowView : public views::View,
void RemovedFromWidget() override;
// views::FocusChangeListener:
void OnWillChangeFocus(views::View* before, views::View* now) override {}
void OnDidChangeFocus(views::View* before, views::View* now) override;
// TabListModel::Observer:

3
chromeos/ui/frame/immersive/immersive_focus_watcher.cc

@ -260,9 +260,6 @@ void ImmersiveFocusWatcher::RecreateBubbleObserver() {
}
}
void ImmersiveFocusWatcher::OnWillChangeFocus(views::View* focused_before,
views::View* focused_now) {}
void ImmersiveFocusWatcher::OnDidChangeFocus(views::View* focused_before,
views::View* focused_now) {
UpdateFocusRevealedLock();

2
chromeos/ui/frame/immersive/immersive_focus_watcher.h

@ -50,8 +50,6 @@ class ImmersiveFocusWatcher
void RecreateBubbleObserver();
// views::FocusChangeListener overrides:
void OnWillChangeFocus(views::View* focused_before,
views::View* focused_now) override;
void OnDidChangeFocus(views::View* focused_before,
views::View* focused_now) override;

2
components/global_media_controls/public/views/media_item_ui_view.h

@ -73,8 +73,6 @@ class COMPONENT_EXPORT(GLOBAL_MEDIA_CONTROLS) MediaItemUIView
const views::SizeBounds& available_size) const override;
// views::FocusChangeListener:
void OnWillChangeFocus(views::View* focused_before,
views::View* focused_now) override {}
void OnDidChangeFocus(views::View* focused_before,
views::View* focused_now) override;

2
ui/message_center/views/message_popup_view.h

@ -62,7 +62,7 @@ class MESSAGE_CENTER_EXPORT MessagePopupView
// in such case MessagePopupView should be deleted. Virtual for unit testing.
virtual void Close();
void OnWillChangeFocus(views::View* before, views::View* now) override {}
// views::FocusChangeListener,
void OnDidChangeFocus(views::View* before, views::View* now) override;
// views::WidgetDelegateView:

2
ui/message_center/views/message_view.cc

@ -412,8 +412,6 @@ void MessageView::OnSlideOut() {
message_center->RemoveNotification(notification_id_copy, /*by_user=*/true);
}
void MessageView::OnWillChangeFocus(views::View* before, views::View* now) {}
void MessageView::OnDidChangeFocus(views::View* before, views::View* now) {
if (Contains(before) || Contains(now) ||
(GetControlButtonsView() && (GetControlButtonsView()->Contains(before) ||

1
ui/message_center/views/message_view.h

@ -189,7 +189,6 @@ class MESSAGE_CENTER_EXPORT MessageView
void OnSlideOut() override;
// views::FocusChangeListener:
void OnWillChangeFocus(views::View* before, views::View* now) override;
void OnDidChangeFocus(views::View* before, views::View* now) override;
void AddObserver(Observer* observer);

4
ui/views/focus/focus_manager.h

@ -106,10 +106,10 @@ class VIEWS_EXPORT FocusTraversable {
class VIEWS_EXPORT FocusChangeListener {
public:
// No change to focus state has occurred yet when this function is called.
virtual void OnWillChangeFocus(View* focused_before, View* focused_now) = 0;
virtual void OnWillChangeFocus(View* focused_before, View* focused_now) {}
// Called after focus state has changed.
virtual void OnDidChangeFocus(View* focused_before, View* focused_now) = 0;
virtual void OnDidChangeFocus(View* focused_before, View* focused_now) {}
// TODO(crbug.com/348369180): Remove this. Debug only.
virtual void OnFocusManagerDestroying(FocusManager* focus_manager) {}