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

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

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

Side by Side Diff: chrome/browser/ui/views/constrained_html_delegate_gtk.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, 2 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 unified diff | Download patch | Annotate | Revision Log

« chrome/browser/ui/gtk/constrained_window_gtk.h ('K') | « chrome/browser/ui/views/collected_cookies_win.cc ('k') | chrome/browser/ui/views/constrained_html_delegate_views.cc » ('j') | chrome/browser/ui/views/constrained_window_views.h » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.

2 // Use of this source code is governed by a BSD-style license that can be	2 // Use of this source code is governed by a BSD-style license that can be

3 // found in the LICENSE file.	3 // found in the LICENSE file.

4	4

5 #include "chrome/browser/ui/webui/constrained_html_ui.h"	5 #include "chrome/browser/ui/webui/constrained_html_ui.h"

6	6

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

8 #include "chrome/browser/ui/gtk/constrained_window_gtk.h"	8 #include "chrome/browser/ui/gtk/constrained_window_gtk.h"

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

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

(...skipping 109 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
120 }	120 }

121	121

122 // static	122 // static

123 ConstrainedWindow* ConstrainedHtmlUI::CreateConstrainedHtmlDialog(	123 ConstrainedWindow* ConstrainedHtmlUI::CreateConstrainedHtmlDialog(

124 Profile* profile,	124 Profile* profile,

125 HtmlDialogUIDelegate* delegate,	125 HtmlDialogUIDelegate* delegate,

126 TabContentsWrapper* wrapper) {	126 TabContentsWrapper* wrapper) {

127 ConstrainedHtmlDelegateGtk* constrained_delegate =	127 ConstrainedHtmlDelegateGtk* constrained_delegate =

128 new ConstrainedHtmlDelegateGtk(profile, delegate);	128 new ConstrainedHtmlDelegateGtk(profile, delegate);

129 ConstrainedWindow* constrained_window =	129 ConstrainedWindow* constrained_window =

130 new ConstrainedWindowGtk(wrapper->tab_contents(), constrained_delegate);	130 new ConstrainedWindowGtk(wrapper, constrained_delegate);

131 constrained_delegate->set_window(constrained_window);	131 constrained_delegate->set_window(constrained_window);

132 return constrained_window;	132 return constrained_window;

133 }	133 }

OLD	NEW