Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1267)

Unified Diff: content/browser/web_contents/web_contents_view_aura.cc

Issue 395753002: Added NULL check in WebContentsViewAura when commencing a drag. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Avoid making a temporary variable (consistent with other uses). Created 6 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/web_contents/web_contents_view_aura.cc
diff --git a/content/browser/web_contents/web_contents_view_aura.cc b/content/browser/web_contents/web_contents_view_aura.cc
index d04508ecd4cd6cf81ba68380725524958f605a5d..63bd454bd6de08cf4dea78aac6a90449c24ed659 100644
--- a/content/browser/web_contents/web_contents_view_aura.cc
+++ b/content/browser/web_contents/web_contents_view_aura.cc
@@ -1493,9 +1493,9 @@ void WebContentsViewAura::OnDragEntered(const ui::DropTargetEvent& event) {
blink::WebDragOperationsMask op = ConvertToWeb(event.source_operations());
// Give the delegate an opportunity to cancel the drag.
- if (!web_contents_->GetDelegate()->CanDragEnter(web_contents_,
- *current_drop_data_.get(),
- op)) {
+ if (web_contents_->GetDelegate() &&
+ !web_contents_->GetDelegate()->CanDragEnter(
+ web_contents_, *current_drop_data_.get(), op)) {
current_drop_data_.reset(NULL);
return;
}
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698