Merge 96419 - Stopping using DiskChanged event for mount/unmount event processing in FileBrowserEventRouter and some bug fixes.

UnmountPath now expects mount_path to be passed to it.

Hiding device notification when disk added event is triggered instead when some
device is mounted (notification handleing needs some more work).

Fixed chromium-os:18339 and chromium-os:17777


BUG=chromium-os:18399, chromium-os:17531, chromium-os:17777
TEST=Made sure FileBrowser works as expected on Cr48.
Review URL: http://codereview.chromium.org/7466046

TBR=tbarzic@chromium.org
Review URL: http://codereview.chromium.org/7690008

git-svn-id: svn://svn.chromium.org/chrome/branches/835/src@97488 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 4 insertions, 5 deletions

diff --git a/chrome/browser/chromeos/cros/mount_library.h b/chrome/browser/chromeos/cros/mount_library.h
index 8be7a8a..a11b741 100644
--- a/chrome/browser/chromeos/cros/mount_library.h
+++ b/chrome/browser/chromeos/cros/mount_library.h
@@ -101,7 +101,6 @@ class MountLibrary {
   };
   typedef std::map<std::string, Disk*> DiskMap;
 
-  // MountPointInfo: {mount_path, mount_type}.
   struct MountPointInfo {
     std::string source_path;
     std::string mount_path;
@@ -114,7 +113,7 @@ class MountLibrary {
     }
   };
 
-  // MountPointMap key is source_path.
+  // MountPointMap key is mount_path.
   typedef std::map<std::string, MountPointInfo> MountPointMap;
 
   typedef void(*UnmountDeviceRecursiveCallbackType)(void*, bool);
@@ -128,8 +127,8 @@ class MountLibrary {
     virtual void DeviceChanged(MountLibraryEventType event,
                                const std::string& device_path ) = 0;
     virtual void MountCompleted(MountEvent event_type,
-        MountError error_code,
-        const MountPointInfo& mount_info) = 0;
+                                MountError error_code,
+                                const MountPointInfo& mount_info) = 0;
   };
 
   virtual ~MountLibrary() {}
@@ -142,7 +141,7 @@ class MountLibrary {
   virtual void MountPath(const char* source_path,
                          MountType type,
                          const MountPathOptions& options) = 0;
-  // |path| may be source od mount path.
+  // |path| is device's mount path.
   virtual void UnmountPath(const char* path) = 0;
 
   // Unmounts device_poath and all of its known children.