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

Side by Side Diff: chrome/browser/ui/gtk/ssl_client_certificate_selector.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
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/ssl_client_certificate_selector.h" 5 #include "chrome/browser/ssl_client_certificate_selector.h"
6 6
7 #include <gtk/gtk.h> 7 #include <gtk/gtk.h>
8 8
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
(...skipping 179 matching lines...) Expand 10 before | Expand all | Expand 10 after
190 190
191 StartObserving(); 191 StartObserving();
192 } 192 }
193 193
194 SSLClientCertificateSelector::~SSLClientCertificateSelector() { 194 SSLClientCertificateSelector::~SSLClientCertificateSelector() {
195 root_widget_.Destroy(); 195 root_widget_.Destroy();
196 } 196 }
197 197
198 void SSLClientCertificateSelector::Show() { 198 void SSLClientCertificateSelector::Show() {
199 DCHECK(!window_); 199 DCHECK(!window_);
200 window_ = new ConstrainedWindowGtk(wrapper_->tab_contents(), this); 200 window_ = new ConstrainedWindowGtk(wrapper_, this);
201 } 201 }
202 202
203 void SSLClientCertificateSelector::OnCertSelectedByNotification() { 203 void SSLClientCertificateSelector::OnCertSelectedByNotification() {
204 delegate_ = NULL; 204 delegate_ = NULL;
205 DCHECK(window_); 205 DCHECK(window_);
206 window_->CloseConstrainedWindow(); 206 window_->CloseConstrainedWindow();
207 } 207 }
208 208
209 GtkWidget* SSLClientCertificateSelector::GetFocusWidget() { 209 GtkWidget* SSLClientCertificateSelector::GetFocusWidget() {
210 return select_button_; 210 return select_button_;
(...skipping 188 matching lines...) Expand 10 before | Expand all | Expand 10 after
399 TabContentsWrapper* wrapper, 399 TabContentsWrapper* wrapper,
400 net::SSLCertRequestInfo* cert_request_info, 400 net::SSLCertRequestInfo* cert_request_info,
401 SSLClientAuthHandler* delegate) { 401 SSLClientAuthHandler* delegate) {
402 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); 402 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
403 (new SSLClientCertificateSelector(wrapper, 403 (new SSLClientCertificateSelector(wrapper,
404 cert_request_info, 404 cert_request_info,
405 delegate))->Show(); 405 delegate))->Show();
406 } 406 }
407 407
408 } // namespace browser 408 } // namespace browser
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698