chrome/browser/ui/gtk/ssl_client_certificate_selector.cc - Issue 11647017: Rename platform-independent ConstrainedWindow types to WebContentsModalDialog types (part 1)

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/ssl_client_certificate_selector.cc

Issue 11647017: Rename platform-independent ConstrainedWindow types to WebContentsModalDialog types (part 1) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 8 years 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

« no previous file with comments | « chrome/browser/ui/gtk/extensions/media_galleries_dialog_gtk.cc ('k') | chrome/browser/ui/gtk/tab_contents/chrome_web_contents_view_delegate_gtk.cc » ('j') | chrome/browser/ui/web_contents_modal_dialog.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index ef52324ff4350064e7c3f38d974b6b42a1f6d789..51ecba00a954277f25ae11704012c21d5c7e0ea0 100644

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

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

@@ -93,7 +93,7 @@ class SSLClientCertificateSelector : public SSLClientAuthObserver,

GtkWidget* select_button_;

WebContents* web_contents_;

- ConstrainedWindow* window_;

+ WebContentsModalDialog* window_;

DISALLOW_COPY_AND_ASSIGN(SSLClientCertificateSelector);

};

@@ -202,7 +202,7 @@ void SSLClientCertificateSelector::Show() {

void SSLClientCertificateSelector::OnCertSelectedByNotification() {

DCHECK(window_);

- window_->CloseConstrainedWindow();

+ window_->CloseWebContentsModalDialog();

}

GtkWidget* SSLClientCertificateSelector::GetFocusWidget() {

@@ -328,7 +328,7 @@ void SSLClientCertificateSelector::Unlocked() {

net::X509Certificate* cert = GetSelectedCert();

CertificateSelected(cert);

DCHECK(window_);

- window_->CloseConstrainedWindow();

+ window_->CloseWebContentsModalDialog();

}

void SSLClientCertificateSelector::OnComboBoxChanged(GtkWidget* combo_box) {

@@ -352,7 +352,7 @@ void SSLClientCertificateSelector::OnViewClicked(GtkWidget* button) {

void SSLClientCertificateSelector::OnCancelClicked(GtkWidget* button) {

CertificateSelected(NULL);

DCHECK(window_);

- window_->CloseConstrainedWindow();

+ window_->CloseWebContentsModalDialog();

}

void SSLClientCertificateSelector::OnOkClicked(GtkWidget* button) {