Chromium Code Reviews| Index: chrome/browser/cocoa/bookmark_bar_controller.mm |
| diff --git a/chrome/browser/cocoa/bookmark_bar_controller.mm b/chrome/browser/cocoa/bookmark_bar_controller.mm |
| index 52ec734ebe31b4bc4caa6eda5ae1cca46cba9cf9..5d2a6d12fe9f61c8aae9d8acca9a5005afe33e3b 100644 |
| --- a/chrome/browser/cocoa/bookmark_bar_controller.mm |
| +++ b/chrome/browser/cocoa/bookmark_bar_controller.mm |
| @@ -80,6 +80,9 @@ |
| } |
| - (void)dealloc { |
| + // Remove our view from its superview so it doesn't attempt to reference |
|
pink (ping after 24hrs)
2009/10/27 15:00:43
is this necessary with dmac's changes, or just a h
Nico
2009/10/27 15:52:42
See http://codereview.chromium.org/334029 .
|
| + // it when the controller is gone. |
| + [[self view] removeFromSuperview]; |
| bridge_.reset(NULL); |
| [[NSNotificationCenter defaultCenter] removeObserver:self]; |
| [super dealloc]; |
| @@ -202,6 +205,22 @@ |
| browser_->profile()->GetPrefs()->GetBoolean(prefs::kShowBookmarkBar); |
| } |
| +- (BOOL)addURLs:(NSArray*)urls withTitles:(NSArray*)titles at:(NSPoint)point { |
| + // TODO(jrg): Support drops on folders etc |
| + // TODO(jrg): Use |point|. |
| + DCHECK([urls count] == [titles count]); |
| + const BookmarkNode* node = bookmarkModel_->GetBookmarkBarNode(); |
| + |
| + for (size_t i = 0; i < [urls count]; ++i) { |
| + bookmarkModel_->AddURL( |
| + node, |
| + node->GetChildCount(), |
| + base::SysNSStringToWide([titles objectAtIndex:i]), |
| + GURL([[urls objectAtIndex:i] UTF8String])); |
| + } |
| + return YES; |
| +} |
| + |
| - (int)currentTabContentsHeight { |
| return browser_->GetSelectedTabContents()->view()->GetContainerSize(). |
| height(); |