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

chrome/browser/chromeos/extensions/file_browser_event_router.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/extensions/file_browser_event_router.h"
 
 #include "base/json/json_writer.h"
 #include "base/stl_util.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
@@ skipping 166 matching lines @@
     chromeos::MountLibrary::MountEvent event_type,
     chromeos::MountError error_code,
     const chromeos::MountLibrary::MountPointInfo& mount_info) {
   if (mount_info.mount_type == chromeos::MOUNT_TYPE_DEVICE &&
       event_type == chromeos::MountLibrary::MOUNTING) {
     chromeos::MountLibrary* mount_lib =
         chromeos::CrosLibrary::Get()->GetMountLibrary();
     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(
                 IDS_FILE_BROWSER_ARCHIVE_MOUNT_FAILED,
                 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(
                 IDS_FILE_BROWSER_ARCHIVE_MOUNT_FAILED,
                 l10n_util::GetStringUTF16(
                     IDS_FILE_BROWSER_DEVICE_TYPE_UNDEFINED),
                 ASCIIToUTF16(MountErrorToString(error_code))));
       }
     }
   }
@@ skipping 251 matching lines @@
           &FileWatcherDelegate::HandleFileWatchOnUIThread,
           local_path,
           true));     // got_error
 }
 
 void
 ExtensionFileBrowserEventRouter::FileWatcherDelegate::HandleFileWatchOnUIThread(
      const FilePath& local_path, bool got_error) {
   router_->HandleFileWatchNotification(local_path, got_error);
 }