diff options
| author | jonross <jonross@chromium.org> | 2016-03-24 13:43:35 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-03-24 20:45:04 +0000 |
| commit | 75eab41568b41bde52a213b53ce31e164cd3ab2d (patch) | |
| tree | 36abacafd2ac31688004587c7d4d5371d736ba02 /chrome/browser | |
| parent | 61f931af0a68ed3ad367952da37b7efd1c8e9460 (diff) | |
| download | chromium_src-75eab41568b41bde52a213b53ce31e164cd3ab2d.zip chromium_src-75eab41568b41bde52a213b53ce31e164cd3ab2d.tar.gz chromium_src-75eab41568b41bde52a213b53ce31e164cd3ab2d.tar.bz2 | |
Remove Alias and Checks in TabDragController::GetTabStripForWindow
In order to isolate a crash we added checks to TabDragController::GetTabStripForWindow.
This was done in: https://codereview.chromium.org/1726743003/
The original source of the crash was found, and fixed in https://codereview.chromium.org/1784903002
This change removes the extra checks we added.
BUG=592850,585017
Review URL: https://codereview.chromium.org/1833693002
Cr-Commit-Position: refs/heads/master@{#383140}
Diffstat (limited to 'chrome/browser')
| -rw-r--r-- | chrome/browser/ui/views/tabs/tab_drag_controller.cc | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/chrome/browser/ui/views/tabs/tab_drag_controller.cc b/chrome/browser/ui/views/tabs/tab_drag_controller.cc index 048140b..54ba502 100644 --- a/chrome/browser/ui/views/tabs/tab_drag_controller.cc +++ b/chrome/browser/ui/views/tabs/tab_drag_controller.cc @@ -9,7 +9,6 @@ #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" @@ -879,15 +878,6 @@ 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; } |