Revert "Use a virtual base class to provide GetWidget()."
This reverts commit b653a4a87f42657888cee0427699ab05f2f304dd.
Reason for revert: Revert for testing whether the size regression disappears.
Original change's description:
> Use a virtual base class to provide GetWidget().
>
> This addresses issues with:
> * Failure to override both GetWidget() variants
> * Having to override just to specify which base class provides the
> implementation
>
> Bug: none
> Change-Id: I87ec1f524d876e4488135ecbcff54aa9591e4e47
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1996948
> Commit-Queue: Peter Kasting <[email protected]>
> Reviewed-by: Scott Violet <[email protected]>
> Reviewed-by: Allen Bauer <[email protected]>
> Cr-Commit-Position: refs/heads/master@{#730791}
[email protected],[email protected],[email protected]
# Not skipping CQ checks because original CL landed > 1 day ago.
Bug: none
Change-Id: I507a2d57d53776df407461887ca06f34b656a885
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2044877
Reviewed-by: Allen Bauer <[email protected]>
Reviewed-by: Peter Kasting <[email protected]>
Commit-Queue: Allen Bauer <[email protected]>
Cr-Commit-Position: refs/heads/master@{#739930}
diff --git a/ash/focus_cycler_unittest.cc b/ash/focus_cycler_unittest.cc
index 4e4f02f..3117bda4 100644
--- a/ash/focus_cycler_unittest.cc
+++ b/ash/focus_cycler_unittest.cc
@@ -46,11 +46,10 @@
std::copy(accessible_panes_.begin(), accessible_panes_.end(),
std::back_inserter(*panes));
}
+ views::Widget* GetWidget() override { return widget_; }
+ const views::Widget* GetWidget() const override { return widget_; }
private:
- // views::WidgetDelegate:
- const views::Widget* GetWidgetImpl() const override { return widget_; }
-
views::Widget* widget_;
std::vector<views::View*> accessible_panes_;
};
diff --git a/ash/lock_screen_action/test_lock_screen_action_background_controller.cc b/ash/lock_screen_action/test_lock_screen_action_background_controller.cc
index 26917717..dffa0a13 100644
--- a/ash/lock_screen_action/test_lock_screen_action_background_controller.cc
+++ b/ash/lock_screen_action/test_lock_screen_action_background_controller.cc
@@ -21,15 +21,14 @@
// views::WidgetDelegate:
void DeleteDelegate() override { delete this; }
+ views::Widget* GetWidget() override { return widget_; }
+ const views::Widget* GetWidget() const override { return widget_; }
bool CanActivate() const override { return false; }
bool CanResize() const override { return true; }
bool CanMaximize() const override { return true; }
bool ShouldAdvanceFocusToTopLevelWidget() const override { return true; }
private:
- // views::WidgetDelegate:
- const views::Widget* GetWidgetImpl() const override { return widget_; }
-
views::Widget* widget_ = nullptr;
DISALLOW_COPY_AND_ASSIGN(TestWindowDelegate);
diff --git a/ash/login/ui/login_test_base.cc b/ash/login/ui/login_test_base.cc
index ab6e9bf..a54d0ec 100644
--- a/ash/login/ui/login_test_base.cc
+++ b/ash/login/ui/login_test_base.cc
@@ -29,13 +29,12 @@
// views::WidgetDelegate:
void DeleteDelegate() override { delete this; }
views::View* GetInitiallyFocusedView() override { return content_; }
-
- private:
- // views::WidgetDelegate:
- const views::Widget* GetWidgetImpl() const override {
+ views::Widget* GetWidget() override { return content_->GetWidget(); }
+ const views::Widget* GetWidget() const override {
return content_->GetWidget();
}
+ private:
views::View* content_;
DISALLOW_COPY_AND_ASSIGN(WidgetDelegate);
diff --git a/ash/public/cpp/lock_screen_widget_factory.cc b/ash/public/cpp/lock_screen_widget_factory.cc
index b4e9682..f8420532 100644
--- a/ash/public/cpp/lock_screen_widget_factory.cc
+++ b/ash/public/cpp/lock_screen_widget_factory.cc
@@ -22,12 +22,11 @@
views::View* GetInitiallyFocusedView() override {
return widget_->GetContentsView();
}
+ views::Widget* GetWidget() override { return widget_; }
+ const views::Widget* GetWidget() const override { return widget_; }
void DeleteDelegate() override { delete this; }
private:
- // views::WidgetDelegate:
- const views::Widget* GetWidgetImpl() const override { return widget_; }
-
views::Widget* widget_;
DISALLOW_COPY_AND_ASSIGN(LockScreenWidgetDelegate);
diff --git a/ash/shelf/shelf_navigation_widget.cc b/ash/shelf/shelf_navigation_widget.cc
index 5b4f351..bb13a6b 100644
--- a/ash/shelf/shelf_navigation_widget.cc
+++ b/ash/shelf/shelf_navigation_widget.cc
@@ -120,6 +120,8 @@
// views::WidgetDelegate:
void DeleteDelegate() override;
bool CanActivate() const override;
+ views::Widget* GetWidget() override { return View::GetWidget(); }
+ const views::Widget* GetWidget() const override { return View::GetWidget(); }
BackButton* back_button() const { return back_button_; }
HomeButton* home_button() const { return home_button_; }
diff --git a/ash/shelf/shelf_widget.cc b/ash/shelf/shelf_widget.cc
index feaef35e..8eee094 100644
--- a/ash/shelf/shelf_widget.cc
+++ b/ash/shelf/shelf_widget.cc
@@ -111,6 +111,8 @@
// views::WidgetDelegate:
void DeleteDelegate() override { delete this; }
+ views::Widget* GetWidget() override { return View::GetWidget(); }
+ const views::Widget* GetWidget() const override { return View::GetWidget(); }
bool CanActivate() const override;
void ReorderChildLayers(ui::Layer* parent_layer) override;
diff --git a/ash/system/status_area_widget_delegate.cc b/ash/system/status_area_widget_delegate.cc
index 6ba2ed75..74b669c 100644
--- a/ash/system/status_area_widget_delegate.cc
+++ b/ash/system/status_area_widget_delegate.cc
@@ -134,6 +134,14 @@
return "ash/StatusAreaWidgetDelegate";
}
+views::Widget* StatusAreaWidgetDelegate::GetWidget() {
+ return View::GetWidget();
+}
+
+const views::Widget* StatusAreaWidgetDelegate::GetWidget() const {
+ return View::GetWidget();
+}
+
void StatusAreaWidgetDelegate::OnGestureEvent(ui::GestureEvent* event) {
views::Widget* target_widget =
static_cast<views::View*>(event->target())->GetWidget();
diff --git a/ash/system/status_area_widget_delegate.h b/ash/system/status_area_widget_delegate.h
index 13cca06..53a3e31 100644
--- a/ash/system/status_area_widget_delegate.h
+++ b/ash/system/status_area_widget_delegate.h
@@ -44,6 +44,8 @@
// views::AccessiblePaneView:
View* GetDefaultFocusableChild() override;
const char* GetClassName() const override;
+ views::Widget* GetWidget() override;
+ const views::Widget* GetWidget() const override;
// ui::EventHandler:
void OnGestureEvent(ui::GestureEvent* event) override;
diff --git a/ash/wm/lock_action_handler_layout_manager_unittest.cc b/ash/wm/lock_action_handler_layout_manager_unittest.cc
index a22b353..196649a 100644
--- a/ash/wm/lock_action_handler_layout_manager_unittest.cc
+++ b/ash/wm/lock_action_handler_layout_manager_unittest.cc
@@ -53,6 +53,8 @@
// views::WidgetDelegate:
void DeleteDelegate() override { delete this; }
+ views::Widget* GetWidget() override { return widget_; }
+ const views::Widget* GetWidget() const override { return widget_; }
bool CanActivate() const override { return true; }
bool CanResize() const override { return true; }
bool CanMaximize() const override { return true; }
@@ -61,9 +63,6 @@
void set_widget(views::Widget* widget) { widget_ = widget; }
private:
- // views::WidgetDelegate:
- const views::Widget* GetWidgetImpl() const override { return widget_; }
-
views::Widget* widget_ = nullptr;
DISALLOW_COPY_AND_ASSIGN(TestWindowDelegate);
diff --git a/ash/wm/lock_layout_manager_unittest.cc b/ash/wm/lock_layout_manager_unittest.cc
index ef6281c..fd15d51 100644
--- a/ash/wm/lock_layout_manager_unittest.cc
+++ b/ash/wm/lock_layout_manager_unittest.cc
@@ -35,13 +35,12 @@
// views::WidgetDelegate:
void DeleteDelegate() override { delete this; }
+ views::Widget* GetWidget() override { return widget_; }
+ const views::Widget* GetWidget() const override { return widget_; }
bool CanActivate() const override { return true; }
bool ShouldAdvanceFocusToTopLevelWidget() const override { return true; }
private:
- // views::WidgetDelegate:
- const views::Widget* GetWidgetImpl() const override { return widget_; }
-
views::Widget* widget_;
DISALLOW_COPY_AND_ASSIGN(LoginTestWidgetDelegate);
diff --git a/ash/wm/splitview/split_view_controller_unittest.cc b/ash/wm/splitview/split_view_controller_unittest.cc
index c1164ed..b0a06f4 100644
--- a/ash/wm/splitview/split_view_controller_unittest.cc
+++ b/ash/wm/splitview/split_view_controller_unittest.cc
@@ -4494,6 +4494,8 @@
// views::WidgetDelegate:
void DeleteDelegate() override { delete this; }
+ views::Widget* GetWidget() override { return widget_; }
+ const views::Widget* GetWidget() const override { return widget_; }
bool CanActivate() const override { return true; }
bool CanResize() const override { return can_resize_; }
bool CanMaximize() const override { return true; }
@@ -4502,9 +4504,6 @@
void set_widget(views::Widget* widget) { widget_ = widget; }
private:
- // views::WidgetDelegate:
- const views::Widget* GetWidgetImpl() const override { return widget_; }
-
bool can_resize_;
views::Widget* widget_ = nullptr;
