summaryrefslogtreecommitdiffstats
path: root/chrome/browser/cocoa/bookmark_editor_controller.mm
diff options
context:
space:
mode:
authorpinkerton@chromium.org <pinkerton@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-15 17:45:04 +0000
committerpinkerton@chromium.org <pinkerton@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-15 17:45:04 +0000
commit85ab30372062556bdff6518c808ee344db1d6c58 (patch)
tree1245e8584bd9cd256046a388973bce0ad59335c8 /chrome/browser/cocoa/bookmark_editor_controller.mm
parent5845cffa85aabe4a05d6b3e41a769d60fd6658fa (diff)
downloadchromium_src-85ab30372062556bdff6518c808ee344db1d6c58.zip
chromium_src-85ab30372062556bdff6518c808ee344db1d6c58.tar.gz
chromium_src-85ab30372062556bdff6518c808ee344db1d6c58.tar.bz2
Hook up "Bookmark All Tabs" on Mac as menu item in Bookmarks menu and tab context menu. Fix a typo in the grd file for adding a bookmark.
BUG=24363 TEST=bookmark all tabs, edit dialog still dims OK when url is invalid for bookmarks that aren't folders. Review URL: http://codereview.chromium.org/269080 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@29138 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/cocoa/bookmark_editor_controller.mm')
-rw-r--r--chrome/browser/cocoa/bookmark_editor_controller.mm2
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/browser/cocoa/bookmark_editor_controller.mm b/chrome/browser/cocoa/bookmark_editor_controller.mm
index dc65dfa..a5a3df6 100644
--- a/chrome/browser/cocoa/bookmark_editor_controller.mm
+++ b/chrome/browser/cocoa/bookmark_editor_controller.mm
@@ -146,7 +146,7 @@ void BookmarkEditor::Show(gfx::NativeWindow parent_hwnd,
name_valid = false;
}
- if (newURL.is_valid() && name_valid) {
+ if (node_ && (node_->is_folder() || newURL.is_valid()) && name_valid) {
[okButton_ setEnabled:YES];
} else {
[okButton_ setEnabled:NO];