Switch from MountLibrary to CrosDisksLibrary

chrome/browser/chromeos/chrome_browser_main_chromeos.cc

 // 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.
 
 #include "chrome/browser/chromeos/chrome_browser_main_chromeos.h"
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/command_line.h"
 #include "base/lazy_instance.h"
 #include "base/message_loop.h"
 #include "chrome/browser/chromeos/bluetooth/bluetooth_manager.h"
 #include "chrome/browser/chromeos/boot_times_loader.h"
 #include "chrome/browser/chromeos/brightness_observer.h"
 #include "chrome/browser/chromeos/cros/cros_library.h"
 #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"
 #include "chrome/browser/chromeos/net/cros_network_change_notifier_factory.h"
 #include "chrome/browser/chromeos/net/network_change_notifier_chromeos.h"
 #include "chrome/browser/chromeos/system/runtime_environment.h"
 #include "chrome/browser/chromeos/system/statistics_provider.h"
 #include "chrome/browser/chromeos/upgrade_detector_chromeos.h"
 #include "chrome/browser/defaults.h"
 #include "chrome/common/chrome_switches.h"
@@ skipping 57 matching lines @@
   // stops monitoring changes from the update engine.
   if (UpgradeDetectorChromeos::GetInstance())
     UpgradeDetectorChromeos::GetInstance()->Shutdown();
 
   // Shutdown the network change notifier for Chrome OS. The network
   // change notifier stops monitoring changes from the power manager and
   // the network manager.
   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
   // DBusThreadManager is shut down.
   if (session_manager_observer_.get()) {
     chromeos::DBusThreadManager::Get()->GetSessionManagerClient()->
         RemoveObserver(session_manager_observer_.get());
   }
   if (brightness_observer_.get()) {
     chromeos::DBusThreadManager::Get()->GetPowerManagerClient()
@@ skipping 68 matching lines @@
   // indication of brightness changes during login.
   brightness_observer_.reset(new chromeos::BrightnessObserver());
   chromeos::DBusThreadManager::Get()->GetPowerManagerClient()->AddObserver(
       brightness_observer_.get());
   // Initialize the session manager observer so that we'll take actions
   // per signals sent from the session manager.
   session_manager_observer_.reset(new chromeos::SessionManagerObserver);
   chromeos::DBusThreadManager::Get()->GetSessionManagerClient()->
       AddObserver(session_manager_observer_.get());
 
+  // Initialize the disk mount manager.
+  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.
   chromeos::CrosNetworkChangeNotifierFactory::GetInstance()->Init();
 
   // Likewise, initialize the upgrade detector for Chrome OS. The upgrade
   // detector starts to monitor changes from the update engine.
   UpgradeDetectorChromeos::GetInstance()->Init();
 
   // For http://crosbug.com/p/5795 and http://crosbug.com/p/6245.
   // Enable Num Lock on X start up.
   if (chromeos::system::runtime_environment::IsRunningOnChromeOS()) {
     chromeos::input_method::InputMethodManager::GetInstance()->GetXKeyboard()->
         SetNumLockEnabled(true);
   }
 }