summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoryosin@chromium.org <yosin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-01-25 02:27:30 +0000
committeryosin@chromium.org <yosin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-01-25 02:27:30 +0000
commite48dec9a249f945b2593f3f45d5aa7ee68f394da (patch)
tree5ec8dd24324457fd8827eeca2f824a82f552af11
parente142ac23de55c717e27c2f492b633f315362592d (diff)
downloadchromium_src-e48dec9a249f945b2593f3f45d5aa7ee68f394da.zip
chromium_src-e48dec9a249f945b2593f3f45d5aa7ee68f394da.tar.gz
chromium_src-e48dec9a249f945b2593f3f45d5aa7ee68f394da.tar.bz2
Merge 178199
> This is regression of r172230. It removed enabling undo-command > from 'command' event handler for document object. > > BUG=170842 > NOTRY=1 > TEST=Delete an item, then hit Ctrl+Z > > Review URL: https://codereview.chromium.org/11859021 TBR=yosin@chromium.org Review URL: https://codereview.chromium.org/11953099 git-svn-id: svn://svn.chromium.org/chrome/branches/1364/src@178737 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/resources/bookmark_manager/js/main.js5
1 files changed, 5 insertions, 0 deletions
diff --git a/chrome/browser/resources/bookmark_manager/js/main.js b/chrome/browser/resources/bookmark_manager/js/main.js
index bc55958..47117d8 100644
--- a/chrome/browser/resources/bookmark_manager/js/main.js
+++ b/chrome/browser/resources/bookmark_manager/js/main.js
@@ -983,6 +983,11 @@ document.addEventListener('canExecute', function(e) {
e.canExecute = !list.isRecent() && !list.isSearch() &&
list.dataModel.length > 1;
break;
+ case 'undo-command':
+ // The global undo command has no visible UI, so always enable it, and
+ // just make it a no-op if undo is not possible.
+ e.canExecute = true;
+ break;
default:
canExecuteForList(e);
break;