chrome/browser/ui/webui/options/media_galleries_handler.cc - Issue 120303003: [StorageMonitor] Move gallery name generation to StorageInfo.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/webui/options/media_galleries_handler.cc

Issue 120303003: [StorageMonitor] Move gallery name generation to StorageInfo. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: update Created 7 years ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« chrome/browser/storage_monitor/storage_info.cc ('K') | « chrome/browser/ui/views/extensions/media_galleries_dialog_views.cc ('k') | chrome/chrome_tests_unit.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/webui/options/media_galleries_handler.cc

diff --git a/chrome/browser/ui/webui/options/media_galleries_handler.cc b/chrome/browser/ui/webui/options/media_galleries_handler.cc

index cef51fe5b51e5e55e70b4e13829d0398587dadbe..b2f80f67d4126da4c845b2d04510cddb861c7b17 100644

--- a/chrome/browser/ui/webui/options/media_galleries_handler.cc

+++ b/chrome/browser/ui/webui/options/media_galleries_handler.cc

@@ -12,6 +12,7 @@

#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"

@@ -93,7 +94,9 @@ void MediaGalleriesHandler::OnGalleriesChanged(

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);