chrome/browser/ui/views/extensions/media_galleries_dialog_views.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/views/extensions/media_galleries_dialog_views.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/storage_monitor/storage_info_unittest.cc ('k') | chrome/browser/ui/webui/options/media_galleries_handler.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/views/extensions/media_galleries_dialog_views.cc

diff --git a/chrome/browser/ui/views/extensions/media_galleries_dialog_views.cc b/chrome/browser/ui/views/extensions/media_galleries_dialog_views.cc

index cfaa4501180657b789b87704a44817758ab09e13..19823bd364ac5ba7a035f700a9700f52e2339f7e 100644

--- a/chrome/browser/ui/views/extensions/media_galleries_dialog_views.cc

+++ b/chrome/browser/ui/views/extensions/media_galleries_dialog_views.cc

@@ -5,6 +5,7 @@

#include "chrome/browser/ui/views/extensions/media_galleries_dialog_views.h"

#include "base/strings/utf_string_conversions.h"

+#include "chrome/browser/storage_monitor/media_storage_util.h"

#include "chrome/browser/ui/views/constrained_window_views.h"

#include "components/web_modal/web_contents_modal_dialog_host.h"

#include "components/web_modal/web_contents_modal_dialog_manager.h"

@@ -199,7 +200,8 @@ bool MediaGalleriesDialogViews::AddOrUpdateGallery(

bool permitted,

views::View* container,

int trailing_vertical_space) {

- string16 label = gallery.GetGalleryDisplayName();

+ string16 label = MediaStorageUtil::GetGalleryDisplayNameFromPath(

+ gallery.path);

string16 tooltip_text = gallery.GetGalleryTooltip();

string16 details = gallery.GetGalleryAdditionalDetails();