Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1221)

Unified Diff: chrome/browser/resources/md_bookmarks/command_manager.js

Issue 2917003003: [MD Bookmarks] Support elision of bookmark names in the bookmark toast. (Closed)
Patch Set: fix multiline Created 3 years, 6 months 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
« no previous file with comments | « chrome/app/bookmarks_strings.grdp ('k') | chrome/browser/resources/md_bookmarks/toast_manager.html » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/resources/md_bookmarks/command_manager.js
diff --git a/chrome/browser/resources/md_bookmarks/command_manager.js b/chrome/browser/resources/md_bookmarks/command_manager.js
index 8960d0a9b94056ae399aadab5c46c0e670e4f1a5..f21578a6365696e4e42c90e99033d2e0dfdb7eee 100644
--- a/chrome/browser/resources/md_bookmarks/command_manager.js
+++ b/chrome/browser/resources/md_bookmarks/command_manager.js
@@ -192,20 +192,20 @@ cr.define('bookmarks', function() {
break;
case Command.DELETE:
var idList = Array.from(this.minimizeDeletionSet_(itemIds));
- var labelPromise;
- if (idList.length == 1) {
- // TODO(calamity): fold this separate label into
- // 'toastItemsDeleted'.
- labelPromise = Promise.resolve(loadTimeData.getStringF(
- 'toastItemDeleted', this.getState().nodes[idList[0]].title));
- } else {
- labelPromise = cr.sendWithPromise(
- 'getPluralString', 'toastItemsDeleted', idList.length);
- }
+ var title = this.getState().nodes[idList[0]].title;
+ var labelPromise = cr.sendWithPromise(
+ 'getPluralString', 'toastItemsDeleted', idList.length);
chrome.bookmarkManagerPrivate.removeTrees(idList, function() {
labelPromise.then(function(label) {
- bookmarks.ToastManager.getInstance().show(label, true);
- });
+ var pieces = loadTimeData.getSubstitutedStringPieces(label, title)
+ .map(function(p) {
+ // Make the bookmark name collapsible.
+ p.collapsible = !!p.arg;
+ return p;
+ });
+ bookmarks.ToastManager.getInstance().showForStringPieces(
+ pieces, true);
+ }.bind(this));
}.bind(this));
break;
case Command.UNDO:
« no previous file with comments | « chrome/app/bookmarks_strings.grdp ('k') | chrome/browser/resources/md_bookmarks/toast_manager.html » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698