| Index: chrome/browser/ui/views/tabs/tab_drag_controller.cc
|
| diff --git a/chrome/browser/ui/views/tabs/tab_drag_controller.cc b/chrome/browser/ui/views/tabs/tab_drag_controller.cc
|
| index eb5dd067822b015bd313fcb34c30eb42867f885c..5c5160367fccd04fa56076e1a5c9f61f7242fba8 100644
|
| --- a/chrome/browser/ui/views/tabs/tab_drag_controller.cc
|
| +++ b/chrome/browser/ui/views/tabs/tab_drag_controller.cc
|
| @@ -9,6 +9,7 @@
|
|
|
| #include "base/auto_reset.h"
|
| #include "base/callback.h"
|
| +#include "base/debug/alias.h"
|
| #include "base/i18n/rtl.h"
|
| #include "base/macros.h"
|
| #include "build/build_config.h"
|
| @@ -859,6 +860,15 @@ TabStrip* TabDragController::GetTabStripForWindow(gfx::NativeWindow window) {
|
| attached_tabstrip_ ? attached_tabstrip_ : source_tabstrip_;
|
| DCHECK(tab_strip);
|
|
|
| + CHECK(instance_);
|
| + if (!other_tabstrip->controller() || !tab_strip->controller()) {
|
| + base::debug::Alias(attached_tabstrip_);
|
| + base::debug::Alias(source_tabstrip_);
|
| + base::debug::Alias(other_tabstrip);
|
| + CHECK(other_tabstrip->controller());
|
| + CHECK(tab_strip->controller());
|
| + }
|
| +
|
| return other_tabstrip->controller()->IsCompatibleWith(tab_strip) ?
|
| other_tabstrip : NULL;
|
| }
|
|
|