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

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

Issue 8497007: Switch from MountLibrary to CrosDisksLibrary (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: NEW! Created 9 years, 1 month 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 2e676f4e4ba31a10d3399f2f646549a46cf0d4b3..ea9d462604da071b31b98f9361e0b2287978642b 100644
--- a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
+++ b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
@@ -16,6 +16,7 @@
#include "chrome/browser/chromeos/dbus/dbus_thread_manager.h"
#include "chrome/browser/chromeos/dbus/power_manager_client.h"
#include "chrome/browser/chromeos/dbus/session_manager_client.h"
+#include "chrome/browser/chromeos/disks/disk_mount_manager.h"
#include "chrome/browser/chromeos/input_method/input_method_manager.h"
#include "chrome/browser/chromeos/input_method/xkeyboard.h"
#include "chrome/browser/chromeos/login/session_manager_observer.h"
@@ -87,6 +88,8 @@ ChromeBrowserMainPartsChromeos::~ChromeBrowserMainPartsChromeos() {
if (chromeos::CrosNetworkChangeNotifierFactory::GetInstance())
chromeos::CrosNetworkChangeNotifierFactory::GetInstance()->Shutdown();
+ chromeos::disks::DiskMountManager::Shutdown();
+
chromeos::BluetoothManager::Shutdown();
// We should remove observers attached to D-Bus clients before
@@ -170,6 +173,9 @@ void ChromeBrowserMainPartsChromeos::PostMainMessageLoopStart() {
chromeos::BluetoothManager::Initialize();
}
+ // Initialize the disk mount manager
satorux1 2011/11/15 21:20:24 a period is missing.
hashimoto 2011/11/16 04:28:15 Done.
+ chromeos::disks::DiskMountManager::Initialize();
+
// Initialize the network change notifier for Chrome OS. The network
// change notifier starts to monitor changes from the power manager and
// the network manager.
« no previous file with comments | « no previous file | chrome/browser/chromeos/cros/burn_library.h » ('j') | chrome/browser/chromeos/disks/disk_mount_manager.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698