Merge 98292 - Show only one error notification per inserted mulitpartitioned usb card.

chrome/browser/chromeos/extensions/file_browser_event_router.cc

Index: chrome/browser/chromeos/extensions/file_browser_event_router.cc
===================================================================
--- chrome/browser/chromeos/extensions/file_browser_event_router.cc	(revision 98836)
+++ chrome/browser/chromeos/extensions/file_browser_event_router.cc	(working copy)
@@ -184,12 +184,15 @@
     chromeos::MountLibrary::Disk* disk =
         mount_lib->disks().find(mount_info.source_path)->second;
 
+    std::string notification_sys_path =
+        disk->system_path().substr(0, disk->system_path().rfind("/block"));
+
     if (!error_code) {
       HideDeviceNotification(disk->system_path());
     } else {
       HideDeviceNotification(disk->system_path());
       if (!disk->drive_label().empty()) {
-        ShowDeviceNotification(disk->system_path(),
+        ShowDeviceNotification(notification_sys_path,
             IDR_PAGEINFO_INFO,
             // TODO(tbarzic): Find more suitable message.
             l10n_util::GetStringFUTF16(
@@ -197,7 +200,7 @@
                 ASCIIToUTF16(disk->drive_label()),
                 ASCIIToUTF16(MountErrorToString(error_code))));
       } else {
-        ShowDeviceNotification(disk->system_path(),
+        ShowDeviceNotification(notification_sys_path,
             IDR_PAGEINFO_INFO,
             // TODO(tbarzic): Find more suitable message.
             l10n_util::GetStringFUTF16(