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

Side by Side Diff: chrome/browser/ui/gtk/ssl_client_certificate_selector.cc

Issue 11633052: Rename platform-independent ConstrainedWindow types to WebContentsModalDialog types (part 2) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: use gtk_widget_get_toplevel for GetNativeWindow Created 7 years, 11 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) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/ssl_client_certificate_selector.h" 5 #include "chrome/browser/ssl/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 75 matching lines...) Expand 10 before | Expand all | Expand 10 after
86 std::vector<std::string> details_strings_; 86 std::vector<std::string> details_strings_;
87 87
88 GtkWidget* cert_combo_box_; 88 GtkWidget* cert_combo_box_;
89 GtkTextBuffer* cert_details_buffer_; 89 GtkTextBuffer* cert_details_buffer_;
90 90
91 ui::OwnedWidgetGtk root_widget_; 91 ui::OwnedWidgetGtk root_widget_;
92 // Hold on to the select button to focus it. 92 // Hold on to the select button to focus it.
93 GtkWidget* select_button_; 93 GtkWidget* select_button_;
94 94
95 WebContents* web_contents_; 95 WebContents* web_contents_;
96 ConstrainedWindow* window_; 96 WebContentsModalDialog* window_;
97 97
98 DISALLOW_COPY_AND_ASSIGN(SSLClientCertificateSelector); 98 DISALLOW_COPY_AND_ASSIGN(SSLClientCertificateSelector);
99 }; 99 };
100 100
101 SSLClientCertificateSelector::SSLClientCertificateSelector( 101 SSLClientCertificateSelector::SSLClientCertificateSelector(
102 WebContents* web_contents, 102 WebContents* web_contents,
103 const net::HttpNetworkSession* network_session, 103 const net::HttpNetworkSession* network_session,
104 net::SSLCertRequestInfo* cert_request_info, 104 net::SSLCertRequestInfo* cert_request_info,
105 const base::Callback<void(net::X509Certificate*)>& callback) 105 const base::Callback<void(net::X509Certificate*)>& callback)
106 : SSLClientAuthObserver(network_session, cert_request_info, callback), 106 : SSLClientAuthObserver(network_session, cert_request_info, callback),
(...skipping 281 matching lines...) Expand 10 before | Expand all | Expand 10 after
388 content::WebContents* contents, 388 content::WebContents* contents,
389 const net::HttpNetworkSession* network_session, 389 const net::HttpNetworkSession* network_session,
390 net::SSLCertRequestInfo* cert_request_info, 390 net::SSLCertRequestInfo* cert_request_info,
391 const base::Callback<void(net::X509Certificate*)>& callback) { 391 const base::Callback<void(net::X509Certificate*)>& callback) {
392 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); 392 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
393 (new SSLClientCertificateSelector( 393 (new SSLClientCertificateSelector(
394 contents, network_session, cert_request_info, callback))->Show(); 394 contents, network_session, cert_request_info, callback))->Show();
395 } 395 }
396 396
397 } // namespace chrome 397 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698