Added mount change notification callback: chrome.fileSystem.onChanged...

chrome/browser/chromeos/cros/mount_library.cc

 // Copyright (c) 2009 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/cros/mount_library.h"
 
 #include <set>
 
 #include "base/message_loop.h"
 #include "base/string_util.h"
 #include "chrome/browser/chromeos/cros/cros_library.h"
 #include "content/browser/browser_thread.h"
 
+const char* kLibraryNotLoaded = "Cros Library has not been loaded";
+
 namespace chromeos {
 
 class MountLibraryImpl : public MountLibrary {
  public:
   MountLibraryImpl() : mount_status_connection_(NULL) {
     if (CrosLibrary::Get()->EnsureLoaded())
       Init();
     else
-      LOG(ERROR) << "Cros Library has not been loaded";
+      LOG(ERROR) << kLibraryNotLoaded;
   }
 
   virtual ~MountLibraryImpl() {
     if (mount_status_connection_)
       DisconnectMountEventMonitor(mount_status_connection_);
   }
 
   // MountLibrary overrides.
   virtual void AddObserver(Observer* observer) OVERRIDE {
     observers_.AddObserver(observer);
   }
 
   virtual void RemoveObserver(Observer* observer) OVERRIDE {
     observers_.RemoveObserver(observer);
   }
 
   virtual void MountPath(const char* device_path) OVERRIDE {
+    CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+    if (!CrosLibrary::Get()->EnsureLoaded()) {
+      OnMountRemovableDevice(device_path,
+                             NULL,
+                             MOUNT_METHOD_ERROR_NOT_LOADED,
+                             kLibraryNotLoaded);
+      return;
+    }
     MountRemovableDevice(device_path,
                          &MountLibraryImpl::MountRemovableDeviceCallback,
                          this);
   }
 
   virtual void UnmountPath(const char* device_path) OVERRIDE {
+    CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+    if (!CrosLibrary::Get()->EnsureLoaded()) {
+      OnUnmountRemovableDevice(device_path,
+                               MOUNT_METHOD_ERROR_NOT_LOADED,
+                               kLibraryNotLoaded);
+      return;
+    }
     UnmountRemovableDevice(device_path,
                            &MountLibraryImpl::UnmountRemovableDeviceCallback,
                            this);
   }
 
   virtual void RequestMountInfoRefresh() OVERRIDE {
+    CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+    if (!CrosLibrary::Get()->EnsureLoaded()) {
+      OnRequestMountInfo(NULL,
+                         0,
+                         MOUNT_METHOD_ERROR_NOT_LOADED,
+                         kLibraryNotLoaded);
+      return;
+    }
     RequestMountInfo(&MountLibraryImpl::RequestMountInfoCallback,
                      this);
   }
 
   virtual void RefreshDiskProperties(const Disk* disk) OVERRIDE {
+    CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
     DCHECK(disk);
+    if (!CrosLibrary::Get()->EnsureLoaded()) {
+      OnGetDiskProperties(disk->device_path().c_str(),
+                          NULL,
+                          MOUNT_METHOD_ERROR_NOT_LOADED,
+                          kLibraryNotLoaded);
+      return;
+    }
     GetDiskProperties(disk->device_path().c_str(),
                       &MountLibraryImpl::GetDiskPropertiesCallback,
                       this);
   }
 
   const DiskMap& disks() const OVERRIDE { return disks_; }
 
  private:
 
   // Callback for MountRemovableDevice method.
@@ skipping 300 matching lines @@
   else
     return new MountLibraryImpl();
 }
 
 }  // namespace chromeos
 
 // Allows InvokeLater without adding refcounting. This class is a Singleton and
 // won't be deleted until it's last InvokeLater is run.
 DISABLE_RUNNABLE_METHOD_REFCOUNT(chromeos::MountLibraryImpl);