chrome/browser/ui/webui/options/certificate_manager_handler.cc - Issue 6770026: Merge 79507 - Before object destruction, make sure that its select dialogs are told that we

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/webui/options/certificate_manager_handler.cc

Issue 6770026: Merge 79507 - Before object destruction, make sure that its select dialogs are told that we (Closed) Base URL: svn://svn.chromium.org/chrome/branches/696/src/

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

Index: chrome/browser/ui/webui/options/certificate_manager_handler.cc

===================================================================

--- chrome/browser/ui/webui/options/certificate_manager_handler.cc (revision 79759)

+++ chrome/browser/ui/webui/options/certificate_manager_handler.cc (working copy)

@@ -681,8 +681,13 @@

password_.clear();

file_data_.clear();

selected_cert_list_.clear();

+ module_ = NULL;

+ // There may be pending file dialogs, we need to tell them that we've gone

+ // away so they don't try and call back to us.

+ if (select_file_dialog_.get())

+ select_file_dialog_->ListenerDestroyed();

select_file_dialog_ = NULL;

- module_ = NULL;

}

void CertificateManagerHandler::ImportServer(const ListValue* args) {

« no previous file with comments | « chrome/browser/ui/webui/options/advanced_options_handler.cc ('k') | no next file » | no next file with comments »