diff options
Diffstat (limited to 'chrome/browser')
| -rw-r--r-- | chrome/browser/cocoa/bookmark_editor_controller.mm | 2 | ||||
| -rw-r--r-- | chrome/browser/cocoa/bookmark_editor_controller_unittest.mm | 1 |
2 files changed, 2 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]; 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) { |