chrome/browser/ui/views/web_dialog_view.cc - Issue 10353007: Extract a minimal subset of WebDialogUI/WebDialogDelegate from src/chrome -> src/ui/web_dialogs

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/views/web_dialog_view.cc

Issue 10353007: Extract a minimal subset of WebDialogUI/WebDialogDelegate from src/chrome -> src/ui/web_dialogs Base URL: http://src.chromium.org/svn/trunk/src/

Patch Set: Created 8 years, 8 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

« chrome/browser/ui/browser.h ('K') | « chrome/browser/ui/views/web_dialog_view.h ('k') | chrome/browser/ui/views/web_dialog_view_browsertest.cc » ('j') | ui/web_dialogs/web_dialog_delegate.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/views/web_dialog_view.cc

===================================================================

--- chrome/browser/ui/views/web_dialog_view.cc (revision 135175)

+++ chrome/browser/ui/views/web_dialog_view.cc (working copy)

@@ -37,7 +37,7 @@

gfx::NativeWindow ShowWebDialog(gfx::NativeWindow parent,

Profile* profile,

Browser* browser,

- WebDialogDelegate* delegate) {

+ web_dialogs::WebDialogDelegate* delegate) {

views::Widget* widget = views::Widget::CreateWindowWithParent(

new WebDialogView(profile, browser, delegate), parent);

widget->Show();

@@ -51,8 +51,8 @@

WebDialogView::WebDialogView(Profile* profile,

Browser* browser,

- WebDialogDelegate* delegate)

- : WebDialogWebContentsDelegate(profile),

+ web_dialogs::WebDialogDelegate* delegate)

+ : ChromeWebDialogWebContentsDelegate(profile),

initialized_(false),

delegate_(delegate),

dialog_controller_(new WebDialogController(this, profile, browser)),

@@ -309,7 +309,7 @@

// Set the delegate. This must be done before loading the page. See

// the comment above WebDialogUI in its header file for why.

- WebDialogUI::GetPropertyAccessor().SetProperty(

+ web_dialogs::WebDialogUI::GetPropertyAccessor().SetProperty(

web_contents->GetPropertyBag(), this);

tab_watcher_.reset(new TabRenderWatcher(web_contents, this));