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

Unified Diff: chrome/browser/sync/util/nigori.cc

Issue 6805019: Move crypto files out of base, to a top level directory. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Fixes comments by eroman Created 9 years, 8 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/sync/util/nigori.h ('k') | chrome/browser/ui/crypto_module_password_dialog.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/sync/util/nigori.cc
===================================================================
--- chrome/browser/sync/util/nigori.cc (revision 81350)
+++ chrome/browser/sync/util/nigori.cc (working copy)
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
@@ -14,18 +14,18 @@
#include <vector>
#include "base/base64.h"
-#include "base/crypto/encryptor.h"
-#include "base/hmac.h"
#include "base/logging.h"
#include "base/rand_util.h"
#include "base/string_util.h"
+#include "crypto/encryptor.h"
+#include "crypto/hmac.h"
using base::Base64Encode;
using base::Base64Decode;
-using base::Encryptor;
-using base::HMAC;
using base::RandInt;
-using base::SymmetricKey;
+using crypto::Encryptor;
+using crypto::HMAC;
+using crypto::SymmetricKey;
namespace browser_sync {
« no previous file with comments | « chrome/browser/sync/util/nigori.h ('k') | chrome/browser/ui/crypto_module_password_dialog.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698