From 85ab30372062556bdff6518c808ee344db1d6c58 Mon Sep 17 00:00:00 2001 From: "pinkerton@chromium.org" Date: Thu, 15 Oct 2009 17:45:04 +0000 Subject: 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 --- chrome/browser/cocoa/bookmark_editor_controller.mm | 2 +- chrome/browser/cocoa/bookmark_editor_controller_unittest.mm | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'chrome/browser/cocoa') 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]; diff --git a/chrome/browser/cocoa/bookmark_editor_controller_unittest.mm b/chrome/browser/cocoa/bookmark_editor_controller_unittest.mm index ed88d5d..d338b4b 100644 --- a/chrome/browser/cocoa/bookmark_editor_controller_unittest.mm +++ b/chrome/browser/cocoa/bookmark_editor_controller_unittest.mm @@ -58,6 +58,7 @@ TEST_F(BookmarkEditorControllerTest, NoNodeNoTree) { EXPECT_NE((NSWindow*)nil, [controller window]); // Forces a nib load EXPECT_EQ(@"", [controller displayName]); EXPECT_EQ(@"", [controller displayURL]); + EXPECT_FALSE([controller okButtonEnabled]); } TEST_F(BookmarkEditorControllerTest, YesNodeShowTree) { -- cgit v1.1