chrome/browser/ui/views/constrained_html_delegate_views.cc - Issue 7867007: content: Resubmit "Move constrained html windows 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 7867007: content: Resubmit "Move constrained html windows to TabContentsWrapper." (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: 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

« no previous file with comments | « chrome/browser/ui/views/constrained_html_delegate_gtk.cc ('k') | chrome/browser/ui/webui/collected_cookies_ui_delegate.cc » ('j') | no next file with comments »
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 e45a2a8fa6e96ff2052c634a5118354cc39f64bf..cc119dc3e2ffa6551268e568ecac5dac51aa762f 100644

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

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

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

#include "base/utf_string_conversions.h"

#include "chrome/browser/profiles/profile.h"

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

#include "chrome/browser/ui/views/constrained_window_views.h"

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

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

@@ -119,11 +120,12 @@ void ConstrainedHtmlDelegateViews::OnDialogCloseFromWebUI() {

ConstrainedWindow* ConstrainedHtmlUI::CreateConstrainedHtmlDialog(

Profile* profile,

HtmlDialogUIDelegate* delegate,

- TabContents* container) {

+ TabContentsWrapper* container) {

ConstrainedHtmlDelegateViews* constrained_delegate =

new ConstrainedHtmlDelegateViews(profile, delegate);

ConstrainedWindow* constrained_window =

- new ConstrainedWindowViews(container, constrained_delegate);

+ new ConstrainedWindowViews(container->tab_contents(),

+ constrained_delegate);

constrained_delegate->set_window(constrained_window);

return constrained_window;

}