Reland: Aura: Fix crash on dragging URL into tab strip

chrome/browser/ui/views/tabs/tab_strip.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/views/tabs/tab_strip.h"
 
 #if defined(OS_WIN)
 #include <windowsx.h>
 #endif
 
@@ skipping 2258 matching lines @@
   if (drop_info_.get() && drop_info_->drop_index == tab_data_index &&
       drop_info_->drop_before == drop_before) {
     return;
   }
 
   bool is_beneath;
   gfx::Rect drop_bounds = GetDropBounds(tab_data_index, drop_before,
                                         &is_beneath);
 
   if (!drop_info_.get()) {
-    drop_info_.reset(new DropInfo(tab_data_index, drop_before, !is_beneath));
+    drop_info_.reset(
+        new DropInfo(tab_data_index, drop_before, !is_beneath, GetWidget()));
   } else {
     drop_info_->drop_index = tab_data_index;
     drop_info_->drop_before = drop_before;
     if (is_beneath == drop_info_->point_down) {
       drop_info_->point_down = !is_beneath;
       drop_info_->arrow_view->SetImage(
           GetDropArrowImage(drop_info_->point_down));
     }
   }
 
@@ skipping 13 matching lines @@
 }
 
 // static
 gfx::ImageSkia* TabStrip::GetDropArrowImage(bool is_down) {
   return ui::ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
       is_down ? IDR_TAB_DROP_DOWN : IDR_TAB_DROP_UP);
 }
 
 // TabStrip::DropInfo ----------------------------------------------------------
 
-TabStrip::DropInfo::DropInfo(int drop_index, bool drop_before, bool point_down)
+TabStrip::DropInfo::DropInfo(int drop_index,
+                             bool drop_before,
+                             bool point_down,
+                             views::Widget* context)
     : drop_index(drop_index),
       drop_before(drop_before),
       point_down(point_down) {
   arrow_view = new views::ImageView;
   arrow_view->SetImage(GetDropArrowImage(point_down));
 
   arrow_window = new views::Widget;
   views::Widget::InitParams params(views::Widget::InitParams::TYPE_POPUP);
   params.keep_on_top = true;
   params.transparent = true;
   params.accept_events = false;
   params.can_activate = false;
   params.bounds = gfx::Rect(drop_indicator_width, drop_indicator_height);
+  params.context = context->GetNativeView();
   arrow_window->Init(params);
   arrow_window->SetContentsView(arrow_view);
 }
 
 TabStrip::DropInfo::~DropInfo() {
   // Close eventually deletes the window, which deletes arrow_view too.
   arrow_window->Close();
 }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ skipping 255 matching lines @@
   if (!adjust_layout_)
     return false;
 
 #if !defined(OS_CHROMEOS)
   if (ui::GetDisplayLayout() != ui::LAYOUT_TOUCH)
     return false;
 #endif
 
   return true;
 }