Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(24)

Side by Side 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: Fix mac compile (add forward declaration to file that didn't have it) 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
OLDNEW
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/login/login_prompt.h" 5 #include "chrome/browser/ui/login/login_prompt.h"
6 6
7 #include <gtk/gtk.h> 7 #include <gtk/gtk.h>
8 8
9 #include "base/utf_string_conversions.h" 9 #include "base/utf_string_conversions.h"
10 #include "chrome/browser/password_manager/password_manager.h" 10 #include "chrome/browser/password_manager/password_manager.h"
11 #include "chrome/browser/tab_contents/tab_contents_view_gtk.h" 11 #include "chrome/browser/tab_contents/tab_contents_view_gtk.h"
12 #include "chrome/browser/tab_contents/tab_util.h" 12 #include "chrome/browser/tab_contents/tab_util.h"
13 #include "chrome/browser/ui/gtk/constrained_window_gtk.h" 13 #include "chrome/browser/ui/gtk/constrained_window_gtk.h"
14 #include "chrome/browser/ui/gtk/gtk_util.h" 14 #include "chrome/browser/ui/gtk/gtk_util.h"
15 #include "chrome/browser/ui/login/login_model.h" 15 #include "chrome/browser/ui/login/login_model.h"
16 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
16 #include "content/browser/browser_thread.h" 17 #include "content/browser/browser_thread.h"
17 #include "content/browser/renderer_host/resource_dispatcher_host.h" 18 #include "content/browser/renderer_host/resource_dispatcher_host.h"
18 #include "content/browser/tab_contents/navigation_controller.h" 19 #include "content/browser/tab_contents/navigation_controller.h"
19 #include "content/browser/tab_contents/tab_contents.h" 20 #include "content/browser/tab_contents/tab_contents.h"
20 #include "content/browser/tab_contents/tab_contents_delegate.h" 21 #include "content/browser/tab_contents/tab_contents_delegate.h"
21 #include "grit/generated_resources.h" 22 #include "grit/generated_resources.h"
22 #include "net/url_request/url_request.h" 23 #include "net/url_request/url_request.h"
23 #include "ui/base/gtk/gtk_hig_constants.h" 24 #include "ui/base/gtk/gtk_hig_constants.h"
24 #include "ui/base/gtk/gtk_signal.h" 25 #include "ui/base/gtk/gtk_signal.h"
25 #include "ui/base/l10n/l10n_util.h" 26 #include "ui/base/l10n/l10n_util.h"
(...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after
108 SetModel(manager); 109 SetModel(manager);
109 110
110 // Scary thread safety note: This can potentially be called *after* SetAuth 111 // Scary thread safety note: This can potentially be called *after* SetAuth
111 // or CancelAuth (say, if the request was cancelled before the UI thread got 112 // or CancelAuth (say, if the request was cancelled before the UI thread got
112 // control). However, that's OK since any UI interaction in those functions 113 // control). However, that's OK since any UI interaction in those functions
113 // will occur via an InvokeLater on the UI thread, which is guaranteed 114 // will occur via an InvokeLater on the UI thread, which is guaranteed
114 // to happen after this is called (since this was InvokeLater'd first). 115 // to happen after this is called (since this was InvokeLater'd first).
115 TabContents* requesting_contents = GetTabContentsForLogin(); 116 TabContents* requesting_contents = GetTabContentsForLogin();
116 DCHECK(requesting_contents); 117 DCHECK(requesting_contents);
117 118
118 SetDialog(new ConstrainedWindowGtk(requesting_contents, this)); 119 TabContentsWrapper* wrapper =
120 TabContentsWrapper::GetCurrentWrapperForContents(requesting_contents);
121 SetDialog(new ConstrainedWindowGtk(wrapper, this));
119 NotifyAuthNeeded(); 122 NotifyAuthNeeded();
120 } 123 }
121 124
122 // Overridden from ConstrainedWindowGtkDelegate: 125 // Overridden from ConstrainedWindowGtkDelegate:
123 virtual GtkWidget* GetWidgetRoot() { 126 virtual GtkWidget* GetWidgetRoot() {
124 return root_.get(); 127 return root_.get();
125 } 128 }
126 129
127 virtual GtkWidget* GetFocusWidget() { 130 virtual GtkWidget* GetFocusWidget() {
128 return username_entry_; 131 return username_entry_;
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
179 // button the default action and mess with the focus. 182 // button the default action and mess with the focus.
180 gtk_widget_set_can_default(ok_, TRUE); 183 gtk_widget_set_can_default(ok_, TRUE);
181 gtk_widget_grab_default(ok_); 184 gtk_widget_grab_default(ok_);
182 } 185 }
183 186
184 // static 187 // static
185 LoginHandler* LoginHandler::Create(net::AuthChallengeInfo* auth_info, 188 LoginHandler* LoginHandler::Create(net::AuthChallengeInfo* auth_info,
186 net::URLRequest* request) { 189 net::URLRequest* request) {
187 return new LoginHandlerGtk(auth_info, request); 190 return new LoginHandlerGtk(auth_info, request);
188 } 191 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/gtk/ssl_client_certificate_selector.cc ('k') | chrome/browser/ui/login/login_prompt_mac.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698