| commit | d66100ebd950c39b80cfd1c72cec618b33eb3491 | [log] [tgz] |
|---|---|---|
| author | Allen Bauer <[email protected]> | Mon Feb 10 18:11:43 2020 |
| committer | Commit Bot <[email protected]> | Mon Feb 10 18:11:43 2020 |
| tree | e973431493a4f74af65cf4e8c84f505a5ae75f52 | |
| parent | 5491722a7f95d90036bad0d94ccc4001be0b1833 [diff] [blame] |
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_; };