From 5acf85a4aebf309d5cb11c6774ef3a067d12a21a Mon Sep 17 00:00:00 2001 From: apacible Date: Fri, 13 Nov 2015 11:13:52 -0800 Subject: Revert of Enable AutoResize for Constrained Web Dialogs for Mac. (patchset #4 id:650001 of https://codereview.chromium.org/1430023002/ ) Reason for revert: This is breaking Mac10.9 browser_tests (flaky): https://build.chromium.org/p/chromium.mac/builders/Mac10.9%20Tests/builds/11410 https://build.chromium.org/p/chromium.mac/builders/Mac10.9%20Tests/builds/11410/steps/browser_tests%20on%20Mac-10.9/logs/ConstrainedWebDialogBrowserTest.ContentResizeInAutoResizingDialog Original issue's description: > Enable AutoResize for Constrained Web Dialogs for Mac. > > Currently only constrained web dialogs for views (Linux/Windows) are able to > autoresize. This change implements the option to pass in minimum and maximum > sizes and enabling autoresizing functionality for OSX. > > This change adds two static functions for options on whether to create a > ConstrainedWindowsMac that autoresizes or is of fixed size. > > BUG=217034 > > Committed: https://crrev.com/0dbc8ff6d68291773b8b233a19e399d00f9262b0 > Cr-Commit-Position: refs/heads/master@{#359497} TBR=thakis@chromium.org,erikchen@chromium.org NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=217034 Review URL: https://codereview.chromium.org/1440173003 Cr-Commit-Position: refs/heads/master@{#359593} --- chrome/browser/ui/webui/constrained_web_dialog_delegate_base.h | 5 ----- 1 file changed, 5 deletions(-) (limited to 'chrome/browser/ui/webui/constrained_web_dialog_delegate_base.h') diff --git a/chrome/browser/ui/webui/constrained_web_dialog_delegate_base.h b/chrome/browser/ui/webui/constrained_web_dialog_delegate_base.h index 2fac4b5..973608f 100644 --- a/chrome/browser/ui/webui/constrained_web_dialog_delegate_base.h +++ b/chrome/browser/ui/webui/constrained_web_dialog_delegate_base.h @@ -23,8 +23,6 @@ class ConstrainedWebDialogDelegateBase : public ConstrainedWebDialogDelegate, public ui::WebDialogWebContentsDelegate { public: - // |browser_context| and |delegate| must outlive |this| instance, whereas - // |this| will take ownership of |tab_delegate|. ConstrainedWebDialogDelegateBase(content::BrowserContext* browser_context, ui::WebDialogDelegate* delegate, WebDialogWebContentsDelegate* tab_delegate); @@ -48,9 +46,6 @@ class ConstrainedWebDialogDelegateBase content::WebContents* source, const content::NativeWebKeyboardEvent& event) override; - // Resize the dialog to the given size. - virtual void ResizeToGivenSize(const gfx::Size size); - private: scoped_ptr web_dialog_delegate_; -- cgit v1.1