diff options
| author | jrg@chromium.org <jrg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-24 23:13:35 +0000 |
|---|---|---|
| committer | jrg@chromium.org <jrg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-24 23:13:35 +0000 |
| commit | a3e1b9618256709ac3a740bd0c2c56ffc042465b (patch) | |
| tree | 02c348a41b86d31e55ae7ac8484b06630a2b4452 | |
| parent | d77ada46dceb41aaea3f80a80a0da1738c6ba4bf (diff) | |
| download | chromium_src-a3e1b9618256709ac3a740bd0c2c56ffc042465b.zip chromium_src-a3e1b9618256709ac3a740bd0c2c56ffc042465b.tar.gz chromium_src-a3e1b9618256709ac3a740bd0c2c56ffc042465b.tar.bz2 | |
Fix DCHECK if dragging bookmarks around on detached bar.
BUG=39071
TEST=NTP, detach bookmark bar. Drag and drop something.
Review URL: http://codereview.chromium.org/1315004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@42553 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/cocoa/bookmark_button.mm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/browser/cocoa/bookmark_button.mm b/chrome/browser/cocoa/bookmark_button.mm index db1f082..a73297d 100644 --- a/chrome/browser/cocoa/bookmark_button.mm +++ b/chrome/browser/cocoa/bookmark_button.mm @@ -87,7 +87,7 @@ static const CGFloat kDragImageOpacity = 0.7; // Overridden to release bar visibility. - (void)endDrag { - DCHECK(visibilityDelegate_); + // visibilityDelegate_ can be nil if we're detached, and that's fine. [visibilityDelegate_ releaseBarVisibilityForOwner:self withAnimation:YES delay:YES]; |