diff options
Diffstat (limited to 'chrome/browser/cocoa')
| -rw-r--r-- | chrome/browser/cocoa/bookmark_bar_controller.mm | 12 | ||||
| -rw-r--r-- | chrome/browser/cocoa/bookmark_bar_folder_controller.mm | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/chrome/browser/cocoa/bookmark_bar_controller.mm b/chrome/browser/cocoa/bookmark_bar_controller.mm index 1663ebb..06c4fe0 100644 --- a/chrome/browser/cocoa/bookmark_bar_controller.mm +++ b/chrome/browser/cocoa/bookmark_bar_controller.mm @@ -494,16 +494,16 @@ const NSTimeInterval kBookmarkBarAnimationDuration = 0.12; case NSRightMouseDown: // If a click in my window and NOT in the bookmark bar, // then is a click outside. - if ((eventWindow == myWindow) && - ([[eventWindow contentView] - hitTest:[event locationInWindow]] != [self view])) { + if (eventWindow == myWindow && + ![[[eventWindow contentView] hitTest:[event locationInWindow]] + isDescendantOf:[self view]]) { return YES; } // If a click in a bookmark bar folder window and that isn't // one of my bookmark bar folders, YES is click outside. - if (([eventWindow isKindOfClass:[BookmarkBarFolderWindow - class]]) && - ([eventWindow parentWindow] != myWindow)) { + if ([eventWindow isKindOfClass:[BookmarkBarFolderWindow + class]] && + [eventWindow parentWindow] != myWindow) { return YES; } break; diff --git a/chrome/browser/cocoa/bookmark_bar_folder_controller.mm b/chrome/browser/cocoa/bookmark_bar_folder_controller.mm index 3afaa18..284d1e3 100644 --- a/chrome/browser/cocoa/bookmark_bar_folder_controller.mm +++ b/chrome/browser/cocoa/bookmark_bar_folder_controller.mm @@ -259,7 +259,7 @@ width += (2 * bookmarks::kBookmarkVerticalPadding); windowFrame.size.width = width; - // Make the window fit on screen, with a distance of at least |padding| to + // Make the window fit on screen, with a distance of at least |padding| from // the sides. if ([[self window] screen]) { // nil in unit tests const CGFloat padding = 8; |