chrome/browser/ui/views/constrained_html_delegate_views.cc - Issue 7880003: content: Move constrained window code from TabContents to TabContentsWrapper

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/constrained_html_delegate_views.cc

Issue 7880003: content: Move constrained window code from TabContents to TabContentsWrapper (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Attempt to fix views merge part 2 Created 9 years, 3 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/gtk/constrained_window_gtk.h ('K') | « chrome/browser/ui/views/constrained_html_delegate_gtk.cc ('k') | chrome/browser/ui/views/constrained_window_views.h » ('j') | chrome/browser/ui/views/constrained_window_views.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

diff --git a/chrome/browser/ui/views/constrained_html_delegate_views.cc b/chrome/browser/ui/views/constrained_html_delegate_views.cc

index 74c2dbe2639a86c2b66ac467505bd4fcd43ebf79..606bc41206c2e001e533c6e3de21c176616c63e9 100644

--- a/chrome/browser/ui/views/constrained_html_delegate_views.cc

+++ b/chrome/browser/ui/views/constrained_html_delegate_views.cc

@@ -129,8 +129,7 @@ ConstrainedWindow* ConstrainedHtmlUI::CreateConstrainedHtmlDialog(

ConstrainedHtmlDelegateViews* constrained_delegate =

new ConstrainedHtmlDelegateViews(profile, delegate);

ConstrainedWindow* constrained_window =

- new ConstrainedWindowViews(container->tab_contents(),

- constrained_delegate);

+ new ConstrainedWindowViews(container, constrained_delegate);

constrained_delegate->set_window(constrained_window);

return constrained_window;

#endif