chrome/browser/ui/gtk/repost_form_warning_gtk.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/gtk/repost_form_warning_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, 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/gtk/repost_form_warning_gtk.h ('k') | chrome/browser/ui/gtk/ssl_client_certificate_selector.cc » ('j') | chrome/browser/ui/views/constrained_window_views.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/gtk/repost_form_warning_gtk.cc

diff --git a/chrome/browser/ui/gtk/repost_form_warning_gtk.cc b/chrome/browser/ui/gtk/repost_form_warning_gtk.cc

index 39d576c4723d792203c3b0c59da9f5deeaca59d7..5edae8ad83c3d6e0cae25487857d71da0ab84ba2 100644

--- a/chrome/browser/ui/gtk/repost_form_warning_gtk.cc

+++ b/chrome/browser/ui/gtk/repost_form_warning_gtk.cc

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

#include "base/message_loop.h"

#include "chrome/browser/repost_form_warning_controller.h"

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

#include "content/browser/browser_thread.h"

#include "content/browser/tab_contents/navigation_controller.h"

#include "content/browser/tab_contents/tab_contents.h"

@@ -54,7 +55,9 @@ RepostFormWarningGtk::RepostFormWarningGtk(GtkWindow* parent,

g_signal_connect(ok_, "clicked", G_CALLBACK(OnRefreshThunk), this);

gtk_box_pack_end(GTK_BOX(buttonBox), ok_, FALSE, TRUE, 0);

- controller_->set_window(new ConstrainedWindowGtk(tab_contents, this));

+ TabContentsWrapper* wrapper =

+ TabContentsWrapper::GetCurrentWrapperForContents(tab_contents);

+ controller_->set_window(new ConstrainedWindowGtk(wrapper, this));

}

GtkWidget* RepostFormWarningGtk::GetWidgetRoot() {