chrome/browser/ui/cocoa/constrained_web_dialog_delegate_mac.mm - Issue 10796049: Move WebDialogWebContentsDelegate to 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/cocoa/constrained_web_dialog_delegate_mac.mm

Issue 10796049: Move WebDialogWebContentsDelegate to ui/web_dialogs. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

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

Index: chrome/browser/ui/cocoa/constrained_web_dialog_delegate_mac.mm

diff --git a/chrome/browser/ui/cocoa/constrained_web_dialog_delegate_mac.mm b/chrome/browser/ui/cocoa/constrained_web_dialog_delegate_mac.mm

index 77a42a0b5e24f8528f51d95fdb36d95276975c6c..bc8f61eea77202b4e6e929d4bfe86ff642c9f4a9 100644

--- a/chrome/browser/ui/cocoa/constrained_web_dialog_delegate_mac.mm

+++ b/chrome/browser/ui/cocoa/constrained_web_dialog_delegate_mac.mm

@@ -9,15 +9,16 @@

#include "base/memory/scoped_nsobject.h"

#include "chrome/browser/ui/cocoa/constrained_window_mac.h"

#include "chrome/browser/ui/tab_contents/tab_contents.h"

-#include "chrome/browser/ui/webui/web_dialog_web_contents_delegate.h"

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

#include "ui/gfx/size.h"

#include "ui/web_dialogs/web_dialog_delegate.h"

#include "ui/web_dialogs/web_dialog_ui.h"

+#include "ui/web_dialogs/web_dialog_web_contents_delegate.h"

using content::WebContents;

-using ui::WebDialogDelegate;

using ui::ConstrainedWebDialogDelegate;

+using ui::WebDialogDelegate;

+using ui::WebDialogWebContentsDelegate;

class ConstrainedWebDialogDelegateMac :

public ConstrainedWindowMacDelegateCustomSheet,