chrome/browser/ui/webui/constrained_web_dialog_delegate_base.cc - 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.cc

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/constrained_web_dialog_delegate_base.h ('k') | chrome/browser/ui/webui/constrained_web_dialog_ui.h » ('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.cc

diff --git a/chrome/browser/ui/webui/constrained_web_dialog_delegate_base.cc b/chrome/browser/ui/webui/constrained_web_dialog_delegate_base.cc

index 0a38d26ce34c61c190c48961ea8bb43ec4749fa1..d23618e31c9ff773307b9339d5b262af6a2a7e3b 100644

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

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

@@ -6,7 +6,7 @@

#include <string>

-#include "chrome/browser/ui/constrained_window.h"

+#include "chrome/browser/ui/web_contents_modal_dialog.h"

#include "chrome/browser/ui/webui/chrome_web_contents_handler.h"

#include "content/public/browser/web_contents.h"

#include "ipc/ipc_message.h"

@@ -66,7 +66,8 @@ void ConstrainedWebDialogDelegateBase::OnDialogCloseFromWebUI() {

window_->CloseWebContentsModalDialog();

}

-void ConstrainedWebDialogDelegateBase::set_window(ConstrainedWindow* window) {

+void ConstrainedWebDialogDelegateBase::set_window(

+ WebContentsModalDialog* window) {

window_ = window;

}

@@ -83,7 +84,7 @@ void ConstrainedWebDialogDelegateBase::ReleaseWebContentsOnDialogClose() {

release_contents_on_close_ = true;

}

-ConstrainedWindow* ConstrainedWebDialogDelegateBase::GetWindow() {

+WebContentsModalDialog* ConstrainedWebDialogDelegateBase::GetWindow() {

return window_;

}