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

Index: chrome/browser/ui/login/login_prompt_gtk.cc

diff --git a/chrome/browser/ui/login/login_prompt_gtk.cc b/chrome/browser/ui/login/login_prompt_gtk.cc

index 6e35c90c6654d08548676b9f9c4658b5dc309ac1..97a546d1d1e05133eae342d0689e1753ad8e76cc 100644

--- a/chrome/browser/ui/login/login_prompt_gtk.cc

+++ b/chrome/browser/ui/login/login_prompt_gtk.cc

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

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

#include "chrome/browser/ui/gtk/gtk_util.h"

#include "chrome/browser/ui/login/login_model.h"

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

#include "content/browser/browser_thread.h"

#include "content/browser/renderer_host/resource_dispatcher_host.h"

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

@@ -115,7 +116,9 @@ class LoginHandlerGtk : public LoginHandler,

TabContents* requesting_contents = GetTabContentsForLogin();

DCHECK(requesting_contents);

- SetDialog(new ConstrainedWindowGtk(requesting_contents, this));

+ TabContentsWrapper* wrapper =

+ TabContentsWrapper::GetCurrentWrapperForContents(requesting_contents);

+ SetDialog(new ConstrainedWindowGtk(wrapper, this));

NotifyAuthNeeded();

}