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

Unified Diff: chrome/browser/chromeos/chrome_browser_main_chromeos.cc

Issue 14179007: Move cryptohome_library to src/chromeos (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 7 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
Index: chrome/browser/chromeos/chrome_browser_main_chromeos.cc
diff --git a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
index 6cc01e0fd137978f821b70ba146756a8975289e2..f23e21b8e7a020c5fcafc4130b95bbe25fc5e575 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();

Powered by Google App Engine
This is Rietveld 408576698