Commit ef5cfe63 authored by Elly Fong-Jones's avatar Elly Fong-Jones Committed by Commit Bot

views: remove ResizableDelegateView from BridgedNativeWidgetInteractiveUITest

Replace it with a vanilla WidgetDelegate using the default contents view.

Bug: 1075649
Change-Id: Ia3beabd4bedc512452cc9430ed605d4b829c727e
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2461212Reviewed-by: default avatarPeter Boström <pbos@chromium.org>
Commit-Queue: Elly Fong-Jones <ellyjones@chromium.org>
Cr-Commit-Position: refs/heads/master@{#816301}
parent fb3b013d
...@@ -21,23 +21,6 @@ ...@@ -21,23 +21,6 @@
namespace views { namespace views {
namespace test { namespace test {
namespace {
// Provide a resizable Widget by default. Starting in 10.11, OSX doesn't
// correctly restore the window size when coming out of fullscreen if the window
// is not user-sizable.
class ResizableDelegateView : public WidgetDelegateView {
public:
ResizableDelegateView() = default;
// WidgetDelgate:
bool CanResize() const override { return true; }
private:
DISALLOW_COPY_AND_ASSIGN(ResizableDelegateView);
};
} // namespace
class BridgedNativeWidgetUITest : public WidgetTest { class BridgedNativeWidgetUITest : public WidgetTest {
public: public:
...@@ -52,7 +35,14 @@ class BridgedNativeWidgetUITest : public WidgetTest { ...@@ -52,7 +35,14 @@ class BridgedNativeWidgetUITest : public WidgetTest {
CreateParams(Widget::InitParams::TYPE_WINDOW); CreateParams(Widget::InitParams::TYPE_WINDOW);
init_params.ownership = Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET; init_params.ownership = Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET;
init_params.bounds = gfx::Rect(100, 100, 300, 200); init_params.bounds = gfx::Rect(100, 100, 300, 200);
init_params.delegate = new ResizableDelegateView; init_params.delegate = new views::WidgetDelegate;
init_params.delegate->SetOwnedByWidget(true);
// Provide a resizable Widget by default. Starting in 10.11, OSX doesn't
// correctly restore the window size when coming out of fullscreen if the
// window is not user-sizable.
init_params.delegate->SetCanResize(true);
widget_ = std::make_unique<Widget>(); widget_ = std::make_unique<Widget>();
widget_->Init(std::move(init_params)); widget_->Init(std::move(init_params));
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment