diff options
author | msw@chromium.org <msw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-06 02:54:56 +0000 |
---|---|---|
committer | msw@chromium.org <msw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-06 02:54:56 +0000 |
commit | 20960d488457c4aafd3f707a097258791d678ec4 (patch) | |
tree | 263a3c637382f6dcf58b2ae26f06df1110eeb580 /chrome/browser/ui/webui/constrained_web_dialog_delegate_base.h | |
parent | 3666ddfc52d87c1b464c63f0005bbb54b3133af5 (diff) | |
download | chromium_src-20960d488457c4aafd3f707a097258791d678ec4.zip chromium_src-20960d488457c4aafd3f707a097258791d678ec4.tar.gz chromium_src-20960d488457c4aafd3f707a097258791d678ec4.tar.bz2 |
Reland Fix Views web-modal dialog widget creation.
The original CL was reverted in r275139 for XP test failures:
http://build.chromium.org/p/chromium.win/builders/XP%20Tests%20%281%29/builds/31455
(MediaGalleriesPlatformAppBrowserTest.Scan timeouts)
I've addressed this here by reverting a test helper:
MediaGalleriesScanResultDialogViews::AcceptDialogForTesting
r272016 regressed web-modal dialog shadow styling.
Use CreateDialogWidget for dialog creation to fix that.
Only set SHADOW_TYPE_NONE for new-style dialogs there.
(removes the double border, consolidates dialog widget init)
Take WidgetDelegate for ConstrainedWebDialogDelegateViewViews.
Mark web-modals as ui::MODAL_TYPE_CHILD and child widgets.
Remove now unused Widget::CreateWindowAsFramelessChild.
(keep a copy for the system-modal captive portal dialog)
(that dialog is very odd, system-modal and "web-modal"?)
Add [Create|Show]WebModalDialogViews helper functions.
Use these for c/b/ui/views web-modal dialog init/show.
(cannot be used by c/b/chromeos, so cleanup less there)
Cleanup includes, cached widgets, using statements, etc.
BUG=376646, 378970
TEST=Views tab-modal dialogs appear as expected.
TBR=wittman@chromium.org,sky@chromium.org
Review URL: https://codereview.chromium.org/319013002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@275303 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ui/webui/constrained_web_dialog_delegate_base.h')
-rw-r--r-- | chrome/browser/ui/webui/constrained_web_dialog_delegate_base.h | 10 |
1 files changed, 4 insertions, 6 deletions
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 0c98460..344d200 100644 --- a/chrome/browser/ui/webui/constrained_web_dialog_delegate_base.h +++ b/chrome/browser/ui/webui/constrained_web_dialog_delegate_base.h @@ -23,17 +23,15 @@ class ConstrainedWebDialogDelegateBase : public ConstrainedWebDialogDelegate, public ui::WebDialogWebContentsDelegate { public: - ConstrainedWebDialogDelegateBase( - content::BrowserContext* browser_context, - ui::WebDialogDelegate* delegate, - WebDialogWebContentsDelegate* tab_delegate); + ConstrainedWebDialogDelegateBase(content::BrowserContext* browser_context, + ui::WebDialogDelegate* delegate, + WebDialogWebContentsDelegate* tab_delegate); virtual ~ConstrainedWebDialogDelegateBase(); bool closed_via_webui() const; // ConstrainedWebDialogDelegate interface. - virtual const ui::WebDialogDelegate* - GetWebDialogDelegate() const OVERRIDE; + virtual const ui::WebDialogDelegate* GetWebDialogDelegate() const OVERRIDE; virtual ui::WebDialogDelegate* GetWebDialogDelegate() OVERRIDE; virtual void OnDialogCloseFromWebUI() OVERRIDE; virtual void ReleaseWebContentsOnDialogClose() OVERRIDE; |