[Media Galleries] Move RemovableStorageInfo notifications to chrome namespace (part 2)

chrome/browser/media_gallery/media_galleries_dialog_controller.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/media_gallery/media_galleries_dialog_controller.h"
 
 #include "base/path_service.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/media_gallery/media_file_system_registry.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/system_monitor/media_storage_util.h"
+#include "chrome/browser/system_monitor/removable_storage_notifications.h"
 #include "chrome/browser/ui/chrome_select_file_policy.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/extensions/extension.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_view.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 
 using extensions::Extension;
 
 namespace chrome {
 
 namespace {
 
 bool IsAttachedDevice(const std::string& device_id) {
   if (!MediaStorageUtil::IsRemovableDevice(device_id))
     return false;
 
-  std::vector<base::SystemMonitor::RemovableStorageInfo> removable_storages =
-      base::SystemMonitor::Get()->GetAttachedRemovableStorage();
+  std::vector<chrome::RemovableStorageNotifications::StorageInfo>

[vandebo (ex-Chrome), 2013/01/18 18:42:58]

Would a using clause make this wrap nicer?

[Greg Billock, 2013/01/22 20:00:39]

I think that's C++11 though.

[vandebo (ex-Chrome), 2013/01/22 23:37:24]

Nope, there's plenty of using directives in the code already.

[Greg Billock, 2013/01/23 00:28:01]

Right. I meant 'using' for inner classes. I could get rid of "chrome" but the
real mouthful is the "RemovableStorageNotifications::StorageInfo"

I'm kind of inclined to think that this should just be "StorageNotifications" or
something like that, as we should delegate the caring of removability to the
observer. That would help out a lot...

On 2013/01/22 23:37:24, vandebo wrote:

+  removable_storages = chrome::RemovableStorageNotifications::GetInstance()->
+      GetAttachedStorage();
   for (size_t i = 0; i < removable_storages.size(); ++i) {
     if (removable_storages[i].device_id == device_id)
       return true;
   }
   return false;
 }
 
 }  // namespace
 
 MediaGalleriesDialogController::MediaGalleriesDialogController(
     content::WebContents* web_contents,
     const Extension& extension,
     const base::Closure& on_finish)
       : web_contents_(web_contents),
         extension_(&extension),
         on_finish_(on_finish) {
   MediaFileSystemRegistry* registry =
       g_browser_process->media_file_system_registry();
   preferences_ = registry->GetPreferences(
       Profile::FromBrowserContext(web_contents->GetBrowserContext()));
   InitializePermissions();
 
   dialog_.reset(MediaGalleriesDialog::Create(this));
 
-  base::SystemMonitor* monitor = base::SystemMonitor::Get();
-  if (monitor)
-    monitor->AddDevicesChangedObserver(this);
+  RemovableStorageNotifications* notifications =
+      RemovableStorageNotifications::GetInstance();
+  if (notifications)
+    notifications->AddObserver(this);
 }
 
 MediaGalleriesDialogController::MediaGalleriesDialogController()
     : web_contents_(NULL),
       extension_(NULL),
       preferences_(NULL) {}
 
 MediaGalleriesDialogController::~MediaGalleriesDialogController() {
-  base::SystemMonitor* monitor = base::SystemMonitor::Get();
-  if (monitor)
-    monitor->RemoveDevicesChangedObserver(this);
+  RemovableStorageNotifications* notifications =
+      RemovableStorageNotifications::GetInstance();
+  if (notifications)
+    notifications->RemoveObserver(this);
 
   if (select_folder_dialog_.get())
     select_folder_dialog_->ListenerDestroyed();
 }
 
 // static
 string16 MediaGalleriesDialogController::GetGalleryDisplayName(
     const MediaGalleryPrefInfo& gallery) {
   string16 name = gallery.display_name;
   if (IsAttachedDevice(gallery.device_id)) {
@@ skipping 116 matching lines @@
       return;
     }
   }
 
   // Lastly, add it to |new_galleries_|.
   new_galleries_.push_back(GalleryPermission(gallery, true));
   dialog_->UpdateGallery(&new_galleries_.back().pref_info, true);
 }
 
 void MediaGalleriesDialogController::OnRemovableStorageAttached(
-    const std::string& id,
-    const string16& /*name*/,
-    const FilePath::StringType& /*location*/) {
-  UpdateGalleryOnDeviceEvent(id, true /* attached */);
+    const RemovableStorageNotifications::StorageInfo& info) {
+  UpdateGalleryOnDeviceEvent(info.device_id, true /* attached */);
 }
 
 void MediaGalleriesDialogController::OnRemovableStorageDetached(
-    const std::string& id) {
-  UpdateGalleryOnDeviceEvent(id, false /* detached */);
+    const RemovableStorageNotifications::StorageInfo& info) {
+  UpdateGalleryOnDeviceEvent(info.device_id, false /* detached */);
 }
 
 void MediaGalleriesDialogController::InitializePermissions() {
   const MediaGalleriesPrefInfoMap& galleries = preferences_->known_galleries();
   for (MediaGalleriesPrefInfoMap::const_iterator iter = galleries.begin();
        iter != galleries.end();
        ++iter) {
     const MediaGalleryPrefInfo& gallery = iter->second;
     if (gallery.type == MediaGalleryPrefInfo::kBlackListed)
       continue;
@@ skipping 54 matching lines @@
 
   if (gallery)
     dialog_->UpdateGallery(&gallery->pref_info, gallery->allowed);
 }
 
 // MediaGalleries dialog -------------------------------------------------------
 
 MediaGalleriesDialog::~MediaGalleriesDialog() {}
 
 }  // namespace chrome