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

Unified Diff: chrome/browser/chromeos/options/vpn_config_view.cc

Issue 8289019: Revert 105136 - [chromiumos] Start TPM token initialization re-tries on login (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/chromeos/login/user_manager.cc ('k') | chrome/browser/chromeos/options/wifi_config_view.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/options/vpn_config_view.cc
===================================================================
--- chrome/browser/chromeos/options/vpn_config_view.cc (revision 105595)
+++ chrome/browser/chromeos/options/vpn_config_view.cc (working copy)
@@ -370,11 +370,9 @@
// 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);
// Label.
« no previous file with comments | « chrome/browser/chromeos/login/user_manager.cc ('k') | chrome/browser/chromeos/options/wifi_config_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698