chrome/browser/ui/cocoa/constrained_web_dialog_delegate_mac.mm - Issue 12334073: Remove WebContents methods that duplicate WebContentsView methods.

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 12334073: Remove WebContents methods that duplicate WebContentsView methods. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 7 years, 10 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 ffb11c2690c0f94c7b8482ae4290504da50dc4e0..eaac62a9a63a47bf366af04311f62840f6ab3ea8 100644

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

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

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

#import "chrome/browser/ui/cocoa/constrained_window/constrained_window_custom_window.h"

#import "chrome/browser/ui/cocoa/constrained_window/constrained_window_mac.h"

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

+#include "content/public/browser/web_contents_view.h"

#include "ui/gfx/size.h"

#include "ui/web_dialogs/web_dialog_delegate.h"

#include "ui/web_dialogs/web_dialog_ui.h"

@@ -113,8 +114,9 @@ ConstrainedWebDialogDelegateViewMac::ConstrainedWebDialogDelegateViewMac(

window_.reset(

[[ConstrainedWindowCustomWindow alloc] initWithContentRect:frame]);

- [GetWebContents()->GetNativeView() setFrame:frame];

- [[window_ contentView] addSubview:GetWebContents()->GetNativeView()];

+ [GetWebContents()->GetView()->GetNativeView() setFrame:frame];

+ [[window_ contentView]

+ addSubview:GetWebContents()->GetView()->GetNativeView()];

scoped_nsobject<CustomConstrainedWindowSheet> sheet(

[[CustomConstrainedWindowSheet alloc]