chrome/browser/ui/gtk/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/gtk/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/constrained_window_tab_helper.h ('K') | « chrome/browser/ui/gtk/collected_cookies_gtk.cc ('k') | chrome/browser/ui/gtk/constrained_window_gtk.h » ('j') | chrome/browser/ui/gtk/constrained_window_gtk.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/gtk/tab_contents_container_gtk.h"	9 #include "chrome/browser/ui/gtk/tab_contents_container_gtk.h"

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

(...skipping 101 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
112 }	112 }

113	113

114 // static	114 // static

115 ConstrainedWindow* ConstrainedHtmlUI::CreateConstrainedHtmlDialog(	115 ConstrainedWindow* ConstrainedHtmlUI::CreateConstrainedHtmlDialog(

116 Profile* profile,	116 Profile* profile,

117 HtmlDialogUIDelegate* delegate,	117 HtmlDialogUIDelegate* delegate,

118 TabContentsWrapper* overshadowed) {	118 TabContentsWrapper* overshadowed) {

119 ConstrainedHtmlDelegateGtk* constrained_delegate =	119 ConstrainedHtmlDelegateGtk* constrained_delegate =

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

121 ConstrainedWindow* constrained_window =	121 ConstrainedWindow* constrained_window =

122 new ConstrainedWindowGtk(overshadowed->tab_contents(),	122 new ConstrainedWindowGtk(overshadowed, constrained_delegate);

123 constrained_delegate);

124 constrained_delegate->set_window(constrained_window);	123 constrained_delegate->set_window(constrained_window);

125 return constrained_window;	124 return constrained_window;

126 }	125 }

OLD	NEW