diff options
| author | stevenjb@chromium.org <stevenjb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-24 16:11:31 +0000 |
|---|---|---|
| committer | stevenjb@chromium.org <stevenjb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-24 16:11:31 +0000 |
| commit | 932ae79a3b85708c8889b9c37c18cb3403cfae1b (patch) | |
| tree | 4d8dff223179c7b24c8a1a9e311b37548d44e909 /chrome/browser/chromeos/chrome_browser_main_chromeos.cc | |
| parent | 231274fcb382c876c9f3654dacdbd00d3c9b1df7 (diff) | |
| download | chromium_src-932ae79a3b85708c8889b9c37c18cb3403cfae1b.zip chromium_src-932ae79a3b85708c8889b9c37c18cb3403cfae1b.tar.gz chromium_src-932ae79a3b85708c8889b9c37c18cb3403cfae1b.tar.bz2 | |
Move cryptohome_library to src/chromeos
This CL does the following:
1. Move [De|En]cryptWithSystemSalt to CryptohomeLibrary
2. Remove CryptohomeLibrary from CrosLibrary
3. Move CryptohomeLibrary to src/chromeos
BUG=233724
For chrome_browser_chromeos.gypi
TBR=sky@chromium.org
Review URL: https://codereview.chromium.org/14179007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@196159 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/chromeos/chrome_browser_main_chromeos.cc')
| -rw-r--r-- | chrome/browser/chromeos/chrome_browser_main_chromeos.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc index 6cc01e0..f23e21b 100644 --- a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc +++ b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc @@ -94,6 +94,7 @@ #include "chromeos/audio/cras_audio_handler.h" #include "chromeos/chromeos_switches.h" #include "chromeos/cryptohome/async_method_caller.h" +#include "chromeos/cryptohome/cryptohome_library.h" #include "chromeos/dbus/dbus_thread_manager.h" #include "chromeos/dbus/power_manager_client.h" #include "chromeos/dbus/session_manager_client.h" @@ -293,6 +294,8 @@ class DBusServices { DBusThreadManager::Initialize(); CrosDBusService::Initialize(); + CryptohomeLibrary::Initialize(); + // This function and SystemKeyEventListener use InputMethodManager. chromeos::input_method::Initialize( content::BrowserThread::GetMessageLoopProxyForThread( @@ -365,6 +368,7 @@ class DBusServices { cryptohome::AsyncMethodCaller::Shutdown(); disks::DiskMountManager::Shutdown(); input_method::Shutdown(); + CryptohomeLibrary::Shutdown(); CrosDBusService::Shutdown(); // NOTE: This must only be called if Initialize() was called. DBusThreadManager::Shutdown(); |