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

Unified Diff: chrome/browser/chromeos/cros/cert_library.cc

Issue 10574040: Remove chromeos::LibraryLoader (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Review fix Created 8 years, 6 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/chromeos/cros/cert_library.cc
diff --git a/chrome/browser/chromeos/cros/cert_library.cc b/chrome/browser/chromeos/cros/cert_library.cc
index a5cade12441dbe0a919cd72e5a141f74999d2197..32118b42390ceb175835bdb6ee281da02cc25a15 100644
--- a/chrome/browser/chromeos/cros/cert_library.cc
+++ b/chrome/browser/chromeos/cros/cert_library.cc
@@ -6,6 +6,7 @@
#include <algorithm>
+#include "base/chromeos/chromeos_version.h"
#include "base/command_line.h"
#include "base/memory/weak_ptr.h"
#include "base/observer_list_threadsafe.h"
@@ -154,7 +155,7 @@ class CertLibraryImpl
// make sure that that case still works.
if (CommandLine::ForCurrentProcess()->HasSwitch(
switches::kLoadOpencryptoki) ||
- CommandLine::ForCurrentProcess()->HasSwitch(switches::kStubCros)) {
+ !base::chromeos::IsRunningOnChromeOS()) {
crypto::EnableTPMTokenForNSS();
// Note: this calls crypto::EnsureTPMTokenReady()
RequestCertificates();
@@ -527,7 +528,9 @@ CertLibrary::~CertLibrary() {
// static
CertLibrary* CertLibrary::GetImpl(bool stub) {
- // No libcros dependencies, so always return CertLibraryImpl() (no stub).
+ // |stub| is ignored since we have no stub of CertLibrary.
+ // TODO(stevenjb): Disassociate CertLibrary from CrosLibrary entirely.
+ // crbug.com/133752
return new CertLibraryImpl();
}
« no previous file with comments | « chrome/browser/chromeos/chrome_browser_main_chromeos.cc ('k') | chrome/browser/chromeos/cros/cros_library.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698