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

Unified Diff: chrome/browser/chromeos/login/owner_manager.cc

Issue 3141031: [Chrome OS] Wire up ownership API from libcros (Closed)
Patch Set: address davemoore comments Created 10 years, 4 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/login/owner_manager.cc
diff --git a/chrome/browser/chromeos/login/owner_manager.cc b/chrome/browser/chromeos/login/owner_manager.cc
index 14c0bc19047722b1da4b9ef3b924f1e8cb50a34f..82b528fe193939c6fda2ae3edef6ba94fac37d58 100644
--- a/chrome/browser/chromeos/login/owner_manager.cc
+++ b/chrome/browser/chromeos/login/owner_manager.cc
@@ -20,67 +20,6 @@ OwnerManager::OwnerManager()
OwnerManager::~OwnerManager() {}
-bool OwnerManager::IsAlreadyOwned() {
- return file_util::PathExists(utils_->GetOwnerKeyFilePath());
-}
-
-bool OwnerManager::StartLoadOwnerKeyAttempt() {
- if (!IsAlreadyOwned()) {
- LOG(ERROR) << "Device not yet owned";
- return false;
- }
- ChromeThread::PostTask(
- ChromeThread::FILE, FROM_HERE,
- NewRunnableMethod(this, &OwnerManager::LoadOwnerKey));
- return true;
-}
-
-bool OwnerManager::StartTakeOwnershipAttempt() {
- if (IsAlreadyOwned()) {
- LOG(ERROR) << "Device is already owned";
- return false;
- }
- ChromeThread::PostTask(
- ChromeThread::FILE, FROM_HERE,
- NewRunnableMethod(this, &OwnerManager::GenerateKeysAndExportPublic));
- return true;
-}
-
-bool OwnerManager::StartSigningAttempt(const std::string& data, Delegate* d) {
- if (!IsAlreadyOwned()) {
- LOG(ERROR) << "Device not yet owned";
- return false;
- }
- ChromeThread::ID thread_id;
- if (!ChromeThread::GetCurrentThreadIdentifier(&thread_id))
- thread_id = ChromeThread::UI;
- ChromeThread::PostTask(
- ChromeThread::FILE, FROM_HERE,
- NewRunnableMethod(this, &OwnerManager::Sign, thread_id, data, d));
- return true;
-}
-
-bool OwnerManager::StartVerifyAttempt(const std::string& data,
- const std::string& signature,
- Delegate* d) {
- if (!IsAlreadyOwned()) {
- LOG(ERROR) << "Device not yet owned";
- return false;
- }
- ChromeThread::ID thread_id;
- if (!ChromeThread::GetCurrentThreadIdentifier(&thread_id))
- thread_id = ChromeThread::UI;
- ChromeThread::PostTask(
- ChromeThread::FILE, FROM_HERE,
- NewRunnableMethod(this,
- &OwnerManager::Verify,
- thread_id,
- data,
- signature,
- d));
- return true;
-}
-
void OwnerManager::LoadOwnerKey() {
DCHECK(ChromeThread::CurrentlyOn(ChromeThread::FILE));
NotificationType result = NotificationType::OWNER_KEY_FETCH_ATTEMPT_FAILED;
@@ -120,13 +59,23 @@ void OwnerManager::GenerateKeysAndExportPublic() {
}
void OwnerManager::ExportKey() {
- NotificationType result = NotificationType::OWNER_KEY_FETCH_ATTEMPT_SUCCEEDED;
- if (!utils_->ExportPublicKeyViaDbus(private_key_.get())) {
+ if (!utils_->ExportPublicKeyViaDbus(private_key_.get(), this)) {
private_key_.reset(NULL);
- result = NotificationType::OWNER_KEY_FETCH_ATTEMPT_FAILED;
+ ChromeThread::PostTask(
+ ChromeThread::UI, FROM_HERE,
+ NewRunnableMethod(this,
+ &OwnerManager::SendNotification,
+ NotificationType::OWNER_KEY_FETCH_ATTEMPT_FAILED,
+ NotificationService::NoDetails()));
}
+}
- // Whether we generated the keys or not, send a notification indicating
+void OwnerManager::Run(bool value) {
+ NotificationType result = NotificationType::OWNER_KEY_FETCH_ATTEMPT_SUCCEEDED;
+ if (!value)
+ result = NotificationType::OWNER_KEY_FETCH_ATTEMPT_FAILED;
+
+ // Whether we exported the public key or not, send a notification indicating
// that we're done with this attempt.
ChromeThread::PostTask(
ChromeThread::UI, FROM_HERE,
@@ -134,6 +83,7 @@ void OwnerManager::ExportKey() {
&OwnerManager::SendNotification,
result,
NotificationService::NoDetails()));
+
}
bool OwnerManager::EnsurePublicKey() {
« no previous file with comments | « chrome/browser/chromeos/login/owner_manager.h ('k') | chrome/browser/chromeos/login/owner_manager_unittest.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698