diff options
| author | jennyz@chromium.org <jennyz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-01 01:44:31 +0000 |
|---|---|---|
| committer | jennyz@chromium.org <jennyz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-01 01:44:31 +0000 |
| commit | 57f5e895ffd8f8e2027d99b970bffec3057e1290 (patch) | |
| tree | 725090d05bad65d62f6a22a502320b22ca32a30c /ash | |
| parent | b7747559bf47a75acf4d599ce4cf504ffc19819c (diff) | |
| download | chromium_src-57f5e895ffd8f8e2027d99b970bffec3057e1290.zip chromium_src-57f5e895ffd8f8e2027d99b970bffec3057e1290.tar.gz chromium_src-57f5e895ffd8f8e2027d99b970bffec3057e1290.tar.bz2 | |
Fix the crash in ShelfView::UpdateDragIconProxy.
BUG=347222
R=skuhne@chromium.org, xiyuan@chromium.org
Review URL: https://codereview.chromium.org/185003004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@254317 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash')
| -rw-r--r-- | ash/shelf/shelf_view.cc | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/ash/shelf/shelf_view.cc b/ash/shelf/shelf_view.cc index 972d24f..6737692 100644 --- a/ash/shelf/shelf_view.cc +++ b/ash/shelf/shelf_view.cc @@ -584,8 +584,12 @@ void ShelfView::CreateDragIconProxy( void ShelfView::UpdateDragIconProxy( const gfx::Point& location_in_screen_coordinates) { - drag_image_->SetScreenPosition( - location_in_screen_coordinates - drag_image_offset_); + // TODO(jennyz): Investigate why drag_image_ becomes NULL at this point per + // crbug.com/34722, while the app list item is still being dragged around. + if (drag_image_) { + drag_image_->SetScreenPosition( + location_in_screen_coordinates - drag_image_offset_); + } } void ShelfView::DestroyDragIconProxy() { |