Some refactoring in file browser notifications:

chrome/browser/chromeos/extensions/file_browser_event_router.cc

 // Copyright (c) 2012 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/bind.h"
 #include "base/json/json_writer.h"
 #include "base/message_loop.h"
 #include "base/prefs/public/pref_change_registrar.h"
@@ skipping 636 matching lines @@
 }
 
 void FileBrowserEventRouter::OnDiskRemoved(
     const DiskMountManager::Disk* disk) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   VLOG(1) << "Disk removed: " << disk->device_path();
 
   if (!disk->mount_path().empty()) {
     notifications_->ShowNotification(
-        FileBrowserNotifications::DEVICE_HARD_UNPLUG, disk->device_path());
+        FileBrowserNotifications::DEVICE_HARD_UNPLUG,
+        disk->system_path_prefix());
     DiskMountManager::GetInstance()->UnmountPath(
         disk->mount_path(), chromeos::UNMOUNT_OPTIONS_LAZY);
   }
   DispatchDiskEvent(disk, false);
 }
 
 void FileBrowserEventRouter::OnDeviceAdded(
     const std::string& device_path) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   VLOG(1) << "Device added : " << device_path;
 
   // If the policy is set instead of showing the new device notification we show
   // a notification that the operation is not permitted.
   if (profile_->GetPrefs()->GetBoolean(prefs::kExternalStorageDisabled)) {
-    notifications_->ShowNotificationWithMessage(
-        FileBrowserNotifications::DEVICE_FAIL,
-        device_path,
-        l10n_util::GetStringUTF16(IDS_EXTERNAL_STORAGE_DISABLED_MESSAGE));
+    notifications_->ShowNotification(
+        FileBrowserNotifications::DEVICE_EXTERNAL_STORAGE_DISABLED,
+        device_path);
     return;
   }
 
   notifications_->RegisterDevice(device_path);
   notifications_->ShowNotificationDelayed(FileBrowserNotifications::DEVICE,
                                           device_path,
                                           base::TimeDelta::FromSeconds(5));
 }
 
 void FileBrowserEventRouter::OnDeviceRemoved(
@@ skipping 188 matching lines @@
   return scoped_refptr<RefcountedProfileKeyedService>(
       new FileBrowserEventRouter(profile));
 }
 
 bool FileBrowserEventRouterFactory::ServiceHasOwnInstanceInIncognito() const {
   // Explicitly and always allow this router in guest login mode.   see
   // chrome/browser/profiles/profile_keyed_base_factory.h comment
   // for the details.
   return true;
 }