diff options
author | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-12-19 03:30:19 +0000 |
---|---|---|
committer | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-12-19 03:30:19 +0000 |
commit | 0ec9512a65f8d7f15dbddd902363994660d85ffb (patch) | |
tree | a075476ee0051162b69ab79308080a1c8ca8c985 /chrome/browser/cocoa/tab_strip_view.mm | |
parent | 732169bb11fbca6eb6048e37f1d897880771115b (diff) | |
download | chromium_src-0ec9512a65f8d7f15dbddd902363994660d85ffb.zip chromium_src-0ec9512a65f8d7f15dbddd902363994660d85ffb.tar.gz chromium_src-0ec9512a65f8d7f15dbddd902363994660d85ffb.tar.bz2 |
Revert 34998, more stabbing in the dark to find a perf regression - Mac: implement DnD of URLs onto Omnibox.
(DnD of text coming in another patch.)
BUG=24631
TEST=Select a URL/link/file from somewhere (a link in a browser, a URL in text, a file from the desktop, etc.) and drag it to the Omnibox in a Chromium browser window; the contents of the Omnibox should be selected to indicate that a drop would replace its contents; dropping should navigate to the appropriate location.
Review URL: http://codereview.chromium.org/481012
TBR=viettrungluu@chromium.org
Review URL: http://codereview.chromium.org/501135
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@35038 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/cocoa/tab_strip_view.mm')
-rw-r--r-- | chrome/browser/cocoa/tab_strip_view.mm | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/chrome/browser/cocoa/tab_strip_view.mm b/chrome/browser/cocoa/tab_strip_view.mm index a5435e9..3eeef0a 100644 --- a/chrome/browser/cocoa/tab_strip_view.mm +++ b/chrome/browser/cocoa/tab_strip_view.mm @@ -4,8 +4,6 @@ #import "chrome/browser/cocoa/tab_strip_view.h" -#import "chrome/browser/cocoa/browser_window_controller.h" -#import "chrome/browser/cocoa/tab_strip_controller.h" #include "base/logging.h" @implementation TabStripView @@ -138,29 +136,22 @@ lastMouseUp_ = (clickCount == 1) ? timestamp : -1000.0; } -// (URLDropTarget protocol) -- (id<URLDropTargetController>)urlDropController { - BrowserWindowController* windowController = [[self window] windowController]; - DCHECK([windowController isKindOfClass:[BrowserWindowController class]]); - return [windowController tabStripController]; -} - -// (URLDropTarget protocol) +// Required by |URLDropTargetHandler|. - (NSDragOperation)draggingEntered:(id<NSDraggingInfo>)sender { return [dropHandler_ draggingEntered:sender]; } -// (URLDropTarget protocol) +// Required by |URLDropTargetHandler|. - (NSDragOperation)draggingUpdated:(id<NSDraggingInfo>)sender { return [dropHandler_ draggingUpdated:sender]; } -// (URLDropTarget protocol) +// Required by |URLDropTargetHandler|. - (void)draggingExited:(id<NSDraggingInfo>)sender { return [dropHandler_ draggingExited:sender]; } -// (URLDropTarget protocol) +// Required by |URLDropTargetHandler|. - (BOOL)performDragOperation:(id<NSDraggingInfo>)sender { return [dropHandler_ performDragOperation:sender]; } |