[StorageMonitor] Move gallery name generation to StorageInfo.

chrome/browser/ui/webui/options/media_galleries_handler.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/ui/webui/options/media_galleries_handler.h"
 
 #include "base/bind.h"
 #include "base/prefs/pref_service.h"
 #include "base/strings/string_number_conversions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/media_galleries/media_file_system_registry.h"
 #include "chrome/browser/media_galleries/media_galleries_histograms.h"
 #include "chrome/browser/profiles/profile.h"
+#include "chrome/browser/storage_monitor/media_storage_util.h"
 #include "chrome/browser/storage_monitor/storage_monitor.h"
 #include "chrome/browser/ui/chrome_select_file_policy.h"
 #include "chrome/common/pref_names.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_view.h"
 #include "content/public/browser/web_ui.h"
 #include "grit/generated_resources.h"
 
 namespace options {
@@ skipping 61 matching lines @@
   DCHECK(pref->IsInitialized());
   ListValue list;
   const MediaGalleriesPrefInfoMap& galleries = pref->known_galleries();
   for (MediaGalleriesPrefInfoMap::const_iterator iter = galleries.begin();
        iter != galleries.end(); ++iter) {
     const MediaGalleryPrefInfo& gallery = iter->second;
     if (gallery.type == MediaGalleryPrefInfo::kBlackListed)
       continue;
 
     DictionaryValue* dict = new DictionaryValue();
-    dict->SetString("displayName", gallery.GetGalleryDisplayName());
+    dict->SetString("displayName",
+                    MediaStorageUtil::GetGalleryDisplayNameFromPath(
+                        gallery.AbsolutePath()));
     dict->SetString("path", gallery.AbsolutePath().LossyDisplayName());
     dict->SetString("id", base::Uint64ToString(gallery.pref_id));
     list.Append(dict);
   }
 
   web_ui()->CallJavascriptFunction(
       "options.MediaGalleriesManager.setAvailableMediaGalleries", list);
 }
 
 void MediaGalleriesHandler::HandleAddNewGallery(const base::ListValue* args) {
@@ skipping 53 matching lines @@
   Profile* profile = Profile::FromWebUI(web_ui());
   MediaGalleriesPreferences* preferences =
       g_browser_process->media_file_system_registry()->GetPreferences(profile);
   DCHECK(preferences->IsInitialized());
   preferences->RemoveGalleryChangeObserver(this);
   preferences->AddGalleryChangeObserver(this);
   OnGalleriesChanged(preferences);
 }
 
 }  // namespace options