chrome/browser/ui/webui/constrained_web_dialog_delegate_base.h - Issue 11633052: Rename platform-independent ConstrainedWindow types to WebContentsModalDialog types (part 2)

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/webui/constrained_web_dialog_delegate_base.h

Issue 11633052: Rename platform-independent ConstrainedWindow types to WebContentsModalDialog types (part 2) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: use gtk_widget_get_toplevel for GetNativeWindow Created 7 years, 12 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/ui/webui/certificate_viewer_webui.cc ('k') | chrome/browser/ui/webui/constrained_web_dialog_delegate_base.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: 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 c814c7d2ea50142bec3afe6c61e34edcca09f2b8..3fcc0fb6b664c0090b048c9ed348432de41e640f 100644

--- a/chrome/browser/ui/webui/constrained_web_dialog_delegate_base.h

+++ b/chrome/browser/ui/webui/constrained_web_dialog_delegate_base.h

@@ -29,7 +29,7 @@ class ConstrainedWebDialogDelegateBase

WebDialogWebContentsDelegate* tab_delegate);

virtual ~ConstrainedWebDialogDelegateBase();

- void set_window(ConstrainedWindow* window);

+ void set_window(WebContentsModalDialog* window);

bool closed_via_webui() const;

// ConstrainedWebDialogDelegate interface.

@@ -38,7 +38,7 @@ class ConstrainedWebDialogDelegateBase

virtual ui::WebDialogDelegate* GetWebDialogDelegate() OVERRIDE;

virtual void OnDialogCloseFromWebUI() OVERRIDE;

virtual void ReleaseWebContentsOnDialogClose() OVERRIDE;

- virtual ConstrainedWindow* GetWindow() OVERRIDE;

+ virtual WebContentsModalDialog* GetWindow() OVERRIDE;

virtual content::WebContents* GetWebContents() OVERRIDE;

// WebDialogWebContentsDelegate interface.

@@ -53,8 +53,9 @@ class ConstrainedWebDialogDelegateBase

private:

scoped_ptr<ui::WebDialogDelegate> web_dialog_delegate_;

- // The constrained window that owns |this|. Saved so we can close it later.

- ConstrainedWindow* window_;

+ // The web contents modal dialog that owns |this|. Saved so we can close it

+ // later.

+ WebContentsModalDialog* window_;

// Holds the HTML to display in the constrained dialog.

scoped_ptr<content::WebContents> web_contents_;