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

Unified Diff: chrome/browser/ui/views/tabs/tab_strip.cc

Issue 12096103: Reland: Aura: Fix crash on dragging URL into tab strip (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 11 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 | « chrome/browser/ui/views/tabs/tab_strip.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/views/tabs/tab_strip.cc
diff --git a/chrome/browser/ui/views/tabs/tab_strip.cc b/chrome/browser/ui/views/tabs/tab_strip.cc
index ed7099e0429194a0ed11f8bfbded23a3ea088c4f..1739fb866ef3d66115e6826abd0170f95575ad18 100644
--- a/chrome/browser/ui/views/tabs/tab_strip.cc
+++ b/chrome/browser/ui/views/tabs/tab_strip.cc
@@ -2276,7 +2276,8 @@ void TabStrip::SetDropIndex(int tab_data_index, bool 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;
@@ -2310,7 +2311,10 @@ gfx::ImageSkia* TabStrip::GetDropArrowImage(bool is_down) {
// 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) {
@@ -2324,6 +2328,7 @@ TabStrip::DropInfo::DropInfo(int drop_index, bool drop_before, bool point_down)
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);
}
« no previous file with comments | « chrome/browser/ui/views/tabs/tab_strip.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698