Rewritten MountLibrary to work with non-blocking mount API calls in libcros....

chrome/browser/ui/browser_init.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/ui/browser_init.h"
 
 #include <algorithm>   // For max().
 
 #include "base/compiler_specific.h"
 #include "base/environment.h"
@@ skipping 69 matching lines @@
 #endif
 
 #if defined(OS_CHROMEOS)
 #include "chrome/browser/chromeos/brightness_observer.h"
 #include "chrome/browser/chromeos/cros/cros_library.h"
 #include "chrome/browser/chromeos/cros/mount_library.h"
 #include "chrome/browser/chromeos/cros/network_library.h"
 #include "chrome/browser/chromeos/customization_document.h"
 #include "chrome/browser/chromeos/enterprise_extension_observer.h"
 #include "chrome/browser/chromeos/gview_request_interceptor.h"
+#include "chrome/browser/chromeos/login/user_manager.h"
 #include "chrome/browser/chromeos/low_battery_observer.h"
 #include "chrome/browser/chromeos/network_message_observer.h"
 #include "chrome/browser/chromeos/network_state_notifier.h"
 #include "chrome/browser/chromeos/system_key_event_listener.h"
 #include "chrome/browser/chromeos/update_observer.h"
 #include "chrome/browser/chromeos/usb_mount_observer.h"
 #include "chrome/browser/chromeos/wm_message_listener.h"
 #include "chrome/browser/chromeos/wm_overview_controller.h"
 #include "chrome/browser/ui/webui/mediaplayer_ui.h"
 #endif
@@ skipping 474 matching lines @@
   // Create the WmOverviewController so it can register with the listener.
   chromeos::WmOverviewController::GetInstance();
 
   // Install the GView request interceptor that will redirect requests
   // of compatible documents (PDF, etc) to the GView document viewer.
   const CommandLine& parsed_command_line = *CommandLine::ForCurrentProcess();
   if (parsed_command_line.HasSwitch(switches::kEnableGView)) {
     chromeos::GViewRequestInterceptor::GetInstance();
   }
   if (process_startup) {
-    // TODO(dhg): Try to make this just USBMountObserver::Get()->set_profile
-    // and have the constructor take care of everything else.
-    chromeos::MountLibrary* lib =
-        chromeos::CrosLibrary::Get()->GetMountLibrary();
-    chromeos::USBMountObserver* observe =
-        chromeos::USBMountObserver::GetInstance();
-    lib->AddObserver(observe);
-    observe->ScanForDevices(lib);
     // Connect the chromeos notifications
 
+    if (chromeos::UserManager::Get()->user_is_logged_in()) {
+      chromeos::MountLibrary* lib =
+          chromeos::CrosLibrary::Get()->GetMountLibrary();
+      chromeos::USBMountObserver* observe =
+          chromeos::USBMountObserver::GetInstance();
+      lib->AddObserver(observe);
+      lib->RequestMountInfoRefresh();
+    }
+
     // This observer is a singleton. It is never deleted but the pointer is kept
     // in a static so that it isn't reported as a leak.
     static chromeos::LowBatteryObserver* low_battery_observer =
         new chromeos::LowBatteryObserver(profile);
     chromeos::CrosLibrary::Get()->GetPowerLibrary()->AddObserver(
         low_battery_observer);
 
     static chromeos::UpdateObserver* update_observer =
         new chromeos::UpdateObserver(profile);
     chromeos::CrosLibrary::Get()->GetUpdateLibrary()->AddObserver(
@@ skipping 775 matching lines @@
     return false;
   automation->SetExpectedTabCount(expected_tabs);
 
   AutomationProviderList* list =
       g_browser_process->InitAutomationProviderList();
   DCHECK(list);
   list->AddProvider(automation);
 
   return true;
 }