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

Unified Diff: chrome/browser/chromeos/app_mode/kiosk_app_manager.cc

Issue 494093002: OwnerKeyUtil is moved to components/ownership. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase. Created 6 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/app_mode/kiosk_app_manager.cc
diff --git a/chrome/browser/chromeos/app_mode/kiosk_app_manager.cc b/chrome/browser/chromeos/app_mode/kiosk_app_manager.cc
index e4e7b0e53247c742d6bb9c586895afe3d0e80042..924cb5c77563ff994128452bd92233d5f4995f6b 100644
--- a/chrome/browser/chromeos/app_mode/kiosk_app_manager.cc
+++ b/chrome/browser/chromeos/app_mode/kiosk_app_manager.cc
@@ -23,7 +23,6 @@
#include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h"
#include "chrome/browser/chromeos/policy/device_local_account.h"
#include "chrome/browser/chromeos/settings/cros_settings.h"
-#include "chrome/browser/chromeos/settings/owner_key_util.h"
#include "chrome/browser/extensions/external_loader.h"
#include "chrome/browser/extensions/external_provider_impl.h"
#include "chrome/common/chrome_paths.h"
@@ -31,6 +30,7 @@
#include "chromeos/chromeos_paths.h"
#include "chromeos/cryptohome/async_method_caller.h"
#include "chromeos/settings/cros_settings_names.h"
+#include "components/ownership/owner_key_util.h"
#include "content/public/browser/browser_thread.h"
namespace chromeos {
@@ -55,7 +55,8 @@ void OnRemoveAppCryptohomeComplete(const std::string& app,
// Check for presence of machine owner public key file.
void CheckOwnerFilePresence(bool *present) {
- scoped_refptr<OwnerKeyUtil> util = OwnerKeyUtil::Create();
+ scoped_refptr<ownership::OwnerKeyUtil> util =
+ ownership::OwnerKeyUtil::Create();
erikwright (departed) 2014/08/25 15:51:06 Ideally you would avoid looking up the path again
ygorshenin1 2014/08/26 14:53:35 Done.
*present = util->IsPublicKeyPresent();
}

Powered by Google App Engine
This is Rietveld 408576698