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

Unified Diff: chrome/browser/password_manager/encryptor_mac.mm

Issue 10875029: Rename MacKeychain to AppleKeychain (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Address Avi's code review: add NStoCFCast and other nits. Created 8 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
« no previous file with comments | « no previous file | chrome/browser/password_manager/encryptor_password_mac.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/password_manager/encryptor_mac.mm
diff --git a/chrome/browser/password_manager/encryptor_mac.mm b/chrome/browser/password_manager/encryptor_mac.mm
index 00116fa1addf3d81478239c4414cfa7a455852f1..c7f1cd40d902584193867e9742da26e7244c3b85 100644
--- a/chrome/browser/password_manager/encryptor_mac.mm
+++ b/chrome/browser/password_manager/encryptor_mac.mm
@@ -10,11 +10,11 @@
#include "base/memory/scoped_ptr.h"
#include "base/utf_string_conversions.h"
#include "chrome/browser/password_manager/encryptor_password_mac.h"
+#include "crypto/apple_keychain.h"
#include "crypto/encryptor.h"
-#include "crypto/keychain_mac.h"
#include "crypto/symmetric_key.h"
-using crypto::MacKeychain;
+using crypto::AppleKeychain;
namespace {
@@ -45,7 +45,7 @@ crypto::SymmetricKey* GetEncryptionKey() {
if (use_mock_keychain) {
password = "mock_password";
} else {
- MacKeychain keychain;
+ AppleKeychain keychain;
EncryptorPassword encryptor_password(keychain);
password = encryptor_password.GetEncryptorPassword();
}
« no previous file with comments | « no previous file | chrome/browser/password_manager/encryptor_password_mac.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698