diff options
author | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-23 18:08:53 +0000 |
---|---|---|
committer | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-23 18:08:53 +0000 |
commit | 7d478a4a4a933e8ceb52d579ca78327af91c899f (patch) | |
tree | 62634be4a22d09b6ffb89422afcf8d01a4986561 /chrome/browser/cocoa/bookmark_bar_view.mm | |
parent | ca21ee3baf737591e6ded0bb24a69234d77d3c77 (diff) | |
download | chromium_src-7d478a4a4a933e8ceb52d579ca78327af91c899f.zip chromium_src-7d478a4a4a933e8ceb52d579ca78327af91c899f.tar.gz chromium_src-7d478a4a4a933e8ceb52d579ca78327af91c899f.tar.bz2 |
TBR: nsylvain
Revert
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@29908 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/cocoa/bookmark_bar_view.mm')
-rw-r--r-- | chrome/browser/cocoa/bookmark_bar_view.mm | 57 |
1 files changed, 0 insertions, 57 deletions
diff --git a/chrome/browser/cocoa/bookmark_bar_view.mm b/chrome/browser/cocoa/bookmark_bar_view.mm index d2dc208..a991e71 100644 --- a/chrome/browser/cocoa/bookmark_bar_view.mm +++ b/chrome/browser/cocoa/bookmark_bar_view.mm @@ -3,10 +3,7 @@ // found in the LICENSE file. #import "chrome/browser/cocoa/bookmark_bar_view.h" - -#import "chrome/browser/cocoa/bookmark_bar_controller.h" #import "third_party/GTM/AppKit/GTMTheme.h" -#import "third_party/mozilla/include/NSPasteboard+Utils.h" @interface BookmarkBarView (Private) - (void)themeDidChangeNotification:(NSNotification*)aNotification; @@ -17,8 +14,6 @@ - (void)dealloc { [[NSNotificationCenter defaultCenter] removeObserver:self]; - // This probably isn't strictly necessary, but can't hurt. - [self unregisterDraggedTypes]; [super dealloc]; } @@ -28,11 +23,6 @@ selector:@selector(themeDidChangeNotification:) name:kGTMThemeDidChangeNotification object:nil]; - - DCHECK(controller_ && "Expected this to be hooked via in Interface Builder"); - NSArray* types = [NSArray arrayWithObjects:NSStringPboardType, - NSHTMLPboardType, NSURLPboardType, nil]; - [self registerForDraggedTypes:types]; } - (void)viewDidMoveToWindow { @@ -61,51 +51,4 @@ return noItemTextfield_; } -// NSDraggingDestination methods - -- (NSDragOperation)draggingEntered:(id<NSDraggingInfo>)info { - if ([[info draggingPasteboard] containsURLData]) - return NSDragOperationCopy; - return NSDragOperationNone; -} - -- (BOOL)wantsPeriodicDraggingUpdates { - // TODO(port): This should probably return |YES| and the controller should - // slide the existing bookmark buttons interactively to the side to make - // room for the about-to-be-dropped bookmark. - return NO; -} - -- (NSDragOperation)draggingUpdated:(id<NSDraggingInfo>)info { - if ([[info draggingPasteboard] containsURLData]) - return NSDragOperationCopy; - return NSDragOperationNone; -} - -- (void)draggingEnded:(id<NSDraggingInfo>)info { -} - -- (void)draggingExited:(id<NSDraggingInfo>)info { -} - -- (BOOL)prepareForDragOperation:(id<NSDraggingInfo>)info { - return YES; -} - -- (BOOL)performDragOperation:(id<NSDraggingInfo>)info { - NSPasteboard* pboard = [info draggingPasteboard]; - DCHECK([pboard containsURLData]); - - NSArray* urls = nil; - NSArray* titles = nil; - [pboard getURLs:&urls andTitles:&titles]; - - return [controller_ addURLs:urls - withTitles:titles - at:[info draggingLocation]]; -} - -- (void)concludeDragOperation:(id<NSDraggingInfo>)info { -} - @end // @implementation BookmarkBarView |