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

Side by Side Diff: chrome/browser/chromeos/cros/cryptohome_library.cc

Issue 9838085: Move files inside chrome/browser/chromeos/dbus to chromeos/dbus (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Rebase Created 8 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/chromeos/cros/cryptohome_library.h" 5 #include "chrome/browser/chromeos/cros/cryptohome_library.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/message_loop.h" 8 #include "base/message_loop.h"
9 #include "base/string_number_conversions.h" 9 #include "base/string_number_conversions.h"
10 #include "base/string_util.h" 10 #include "base/string_util.h"
11 #include "chrome/browser/chromeos/dbus/cryptohome_client.h"
12 #include "chrome/browser/chromeos/dbus/dbus_thread_manager.h"
13 #include "chrome/common/chrome_switches.h" 11 #include "chrome/common/chrome_switches.h"
12 #include "chromeos/dbus/cryptohome_client.h"
13 #include "chromeos/dbus/dbus_thread_manager.h"
14 #include "content/public/browser/browser_thread.h" 14 #include "content/public/browser/browser_thread.h"
15 #include "crypto/encryptor.h" 15 #include "crypto/encryptor.h"
16 #include "crypto/sha2.h" 16 #include "crypto/sha2.h"
17 17
18 using content::BrowserThread; 18 using content::BrowserThread;
19 19
20 namespace { 20 namespace {
21 21
22 const char kStubSystemSalt[] = "stub_system_salt"; 22 const char kStubSystemSalt[] = "stub_system_salt";
23 const int kPassHashLen = 32; 23 const int kPassHashLen = 32;
(...skipping 237 matching lines...) Expand 10 before | Expand all | Expand 10 after
261 CryptohomeLibrary* CryptohomeLibrary::GetImpl(bool stub) { 261 CryptohomeLibrary* CryptohomeLibrary::GetImpl(bool stub) {
262 CryptohomeLibrary* impl; 262 CryptohomeLibrary* impl;
263 if (stub) 263 if (stub)
264 impl = new CryptohomeLibraryStubImpl(); 264 impl = new CryptohomeLibraryStubImpl();
265 else 265 else
266 impl = new CryptohomeLibraryImpl(); 266 impl = new CryptohomeLibraryImpl();
267 return impl; 267 return impl;
268 } 268 }
269 269
270 } // namespace chromeos 270 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/cros/cert_library.cc ('k') | chrome/browser/chromeos/cros/onc_network_parser_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698