diff options
| author | dhollowa@chromium.org <dhollowa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-22 03:33:53 +0000 |
|---|---|---|
| committer | dhollowa@chromium.org <dhollowa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-22 03:33:53 +0000 |
| commit | dcf512bb156c84277e7a3ccd53fdfd92c8f33cea (patch) | |
| tree | 631db6499a5b050e4a89a99c552c366a66495a48 | |
| parent | 127203609c2be8366d4b4052e9ab3f83f54b96c3 (diff) | |
| download | chromium_src-dcf512bb156c84277e7a3ccd53fdfd92c8f33cea.zip chromium_src-dcf512bb156c84277e7a3ccd53fdfd92c8f33cea.tar.gz chromium_src-dcf512bb156c84277e7a3ccd53fdfd92c8f33cea.tar.bz2 | |
Merge 45279 - Bookmark Hover: Introduced an overdelete with attempt at timer safety.
Removing redundant timer supspension. This was causing an over delete when dragging to parent folder.
BUG=40006
TEST=BookmarkBarFolderControllerTest.HoverState
Review URL: http://codereview.chromium.org/1766003
TBR=jrg@chromium.org
Review URL: http://codereview.chromium.org/1718008
git-svn-id: svn://svn.chromium.org/chrome/branches/375/src@45280 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/cocoa/bookmark_bar_folder_hover_state.h | 1 | ||||
| -rw-r--r-- | chrome/browser/cocoa/bookmark_bar_folder_hover_state.mm | 6 |
2 files changed, 0 insertions, 7 deletions
diff --git a/chrome/browser/cocoa/bookmark_bar_folder_hover_state.h b/chrome/browser/cocoa/bookmark_bar_folder_hover_state.h index 8ed03f7..1c103d6 100644 --- a/chrome/browser/cocoa/bookmark_bar_folder_hover_state.h +++ b/chrome/browser/cocoa/bookmark_bar_folder_hover_state.h @@ -49,7 +49,6 @@ // Designated initializer. - (id)init; -- (void)dealloc; // The BookmarkBarFolderHoverState decides when it is appropriate to hide // and show the button that the BookmarkBarFolderController drags over. diff --git a/chrome/browser/cocoa/bookmark_bar_folder_hover_state.mm b/chrome/browser/cocoa/bookmark_bar_folder_hover_state.mm index 27fb156..5d977e4 100644 --- a/chrome/browser/cocoa/bookmark_bar_folder_hover_state.mm +++ b/chrome/browser/cocoa/bookmark_bar_folder_hover_state.mm @@ -20,12 +20,6 @@ return self; } -- (void)dealloc { - // Finalize using |draggingExited:| to cancel any pending hover actions. - [self draggingExited]; - [super dealloc]; -} - - (NSDragOperation)draggingEnteredButton:(BookmarkButton*)button { if ([button isFolder]) { if (hoverButton_ == button) { |