Index: chrome/browser/resources/bookmark_manager/js/main.js |
diff --git a/chrome/browser/resources/bookmark_manager/js/main.js b/chrome/browser/resources/bookmark_manager/js/main.js |
index 626994851e710e66b40ffaaa26332354a4fd98df..c24e1eac48bc8c02ce0e046e386ff332da98e287 100644 |
--- a/chrome/browser/resources/bookmark_manager/js/main.js |
+++ b/chrome/browser/resources/bookmark_manager/js/main.js |
@@ -1259,7 +1259,7 @@ function getFilteredSelectedBookmarkIds(opt_target) { |
*/ |
function handleCommand(e) { |
var command = e.command; |
- var target; |
+ var target = assertInstanceof(e.target, HTMLElement); |
switch (command.id) { |
case 'import-menu-command': |
recordUserAction('Import'); |
@@ -1288,31 +1288,26 @@ function handleCommand(e) { |
case 'open-in-new-tab-command': |
case 'open-in-background-tab-command': |
recordUserAction('OpenInNewTab'); |
- openBookmarks(LinkKind.BACKGROUND_TAB, |
- assertInstanceof(e.target, HTMLElement)); |
+ openBookmarks(LinkKind.BACKGROUND_TAB, target); |
break; |
case 'open-in-new-window-command': |
recordUserAction('OpenInNewWindow'); |
- openBookmarks(LinkKind.WINDOW, |
- assertInstanceof(e.target, HTMLElement)); |
+ openBookmarks(LinkKind.WINDOW, target); |
break; |
case 'open-incognito-window-command': |
recordUserAction('OpenIncognito'); |
- openBookmarks(LinkKind.INCOGNITO, |
- assertInstanceof(e.target, HTMLElement)); |
+ openBookmarks(LinkKind.INCOGNITO, target); |
break; |
case 'delete-from-folders-menu-command': |
- target = bmm.tree; |
case 'delete-command': |
recordUserAction('Delete'); |
- deleteBookmarks(target || assertInstanceof(e.target, HTMLElement)); |
+ deleteBookmarks(target); |
break; |
case 'copy-from-folders-menu-command': |
- target = bmm.tree; |
case 'copy-command': |
recordUserAction('Copy'); |
chrome.bookmarkManagerPrivate.copy(getSelectedBookmarkIds(target), |
@@ -1320,7 +1315,6 @@ function handleCommand(e) { |
break; |
case 'cut-from-folders-menu-command': |
- target = bmm.tree; |
case 'cut-command': |
recordUserAction('Cut'); |
chrome.bookmarkManagerPrivate.cut(getSelectedBookmarkIds(target), |
@@ -1348,11 +1342,8 @@ function handleCommand(e) { |
break; |
case 'rename-folder-command': |
- editItem(assertInstanceof(e.target, HTMLElement)); |
- break; |
- |
case 'rename-folder-from-folders-menu-command': |
- editItem(bmm.tree); |
Bernhard Bauer
2015/04/20 10:28:27
You want to keep this, so that the tree is always
|
+ editItem(target); |
break; |
case 'edit-command': |
@@ -1361,7 +1352,6 @@ function handleCommand(e) { |
break; |
case 'new-folder-from-folders-menu-command': |
- target = bmm.tree; |
Bernhard Bauer
2015/04/20 10:28:27
You also want to keep this.
|
case 'new-folder-command': |
recordUserAction('NewFolder'); |
newFolder(target); |