chrome/browser/chromeos/options/vpn_config_view.cc - Issue 8212003: [chromiumos] Start TPM token initialization re-tries on login

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/chromeos/options/vpn_config_view.cc

Issue 8212003: [chromiumos] Start TPM token initialization re-tries on login (Closed) Base URL: http://git.chromium.org/chromium/src.git@master

Patch Set: Remove RequestCertificates() call from wifi|vpn views. 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:

Index: chrome/browser/chromeos/options/vpn_config_view.cc

diff --git a/chrome/browser/chromeos/options/vpn_config_view.cc b/chrome/browser/chromeos/options/vpn_config_view.cc

index c0df06fb12960d176f01fe3335134100b23ff1f0..22ad346ec5a543fc36969fbedc4010be12d4f2ae 100644

--- a/chrome/browser/chromeos/options/vpn_config_view.cc

+++ b/chrome/browser/chromeos/options/vpn_config_view.cc

@@ -368,8 +368,10 @@ void VPNConfigView::Init(VirtualNetwork* vpn) {

// VPN may require certificates, so always set the library and observe.

cert_library_ = chromeos::CrosLibrary::Get()->GetCertLibrary();

- cert_library_->AddObserver(this);

- cert_library_->RequestCertificates();

+ // Setup a callback if certificates are yet to be loaded.

+ if (!cert_library_->CertificatesLoaded())

+ cert_library_->AddObserver(this);

int column_view_set_id = 0;

views::ColumnSet* column_set = layout->AddColumnSet(column_view_set_id);