diff options
author | rohitrao@chromium.org <rohitrao@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-05 16:22:54 +0000 |
---|---|---|
committer | rohitrao@chromium.org <rohitrao@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-05 16:22:54 +0000 |
commit | 3264774f72062f95a5328e65efd0dc5075fec691 (patch) | |
tree | 5a168a6eea40a4421873dbdc3fa9bfe530dfc5cf /chrome/browser/cocoa/bookmark_bar_folder_controller.mm | |
parent | 33f39d5985daafddf49ad68be2e1c4c03baad06c (diff) | |
download | chromium_src-3264774f72062f95a5328e65efd0dc5075fec691.zip chromium_src-3264774f72062f95a5328e65efd0dc5075fec691.tar.gz chromium_src-3264774f72062f95a5328e65efd0dc5075fec691.tar.bz2 |
[Mac] Lock open the fullscreen overlay when browsing bookmark folders.
BUG=37271
TEST=Go fullscreen. Open a folder on the bookmarkbar and hover over one of its subentries. Overlay should not scroll back up.
Review URL: http://codereview.chromium.org/669086
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@40740 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/cocoa/bookmark_bar_folder_controller.mm')
-rw-r--r-- | chrome/browser/cocoa/bookmark_bar_folder_controller.mm | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/chrome/browser/cocoa/bookmark_bar_folder_controller.mm b/chrome/browser/cocoa/bookmark_bar_folder_controller.mm index 7dedb21..f000750c 100644 --- a/chrome/browser/cocoa/bookmark_bar_folder_controller.mm +++ b/chrome/browser/cocoa/bookmark_bar_folder_controller.mm @@ -11,7 +11,7 @@ #import "chrome/browser/cocoa/bookmark_bar_controller.h" // namespace bookmarks #import "chrome/browser/cocoa/bookmark_bar_folder_view.h" #import "chrome/browser/cocoa/bookmark_button_cell.h" - +#import "chrome/browser/cocoa/browser_window_controller.h" @interface BookmarkBarFolderController(Private) - (void)configureWindow; @@ -52,6 +52,13 @@ [super dealloc]; } +// Overriden from NSWindowController to call childFolderWillShow: before showing +// the window. +- (void)showWindow:(id)sender { + [parentController_ childFolderWillShow:self]; + [super showWindow:sender]; +} + // Update theme information for all our buttons. - (void)updateTheme:(ThemeProvider*)themeProvider { if (!themeProvider) @@ -224,6 +231,14 @@ return [parentController_ themeProvider]; } +- (void)childFolderWillShow:(id<BookmarkButtonControllerProtocol>)child { + // Do nothing. +} + +- (void)childFolderWillClose:(id<BookmarkButtonControllerProtocol>)child { + // Do nothing. +} + // Recursively close all bookmark folders. - (void)closeAllBookmarkFolders { // Closing the top level implicitly closes all children. @@ -255,6 +270,7 @@ // Delegate callback. - (void)windowWillClose:(NSNotification*)notification { + [parentController_ childFolderWillClose:self]; [[self parentWindow] removeChildWindow:[self window]]; [self closeBookmarkFolder:self]; [self autorelease]; |