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

Unified Diff: chrome/browser/tabs/tab_strip_model.cc

Issue 6291011: Removes debugging code as cause of crash was found. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 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 | « no previous file | chrome/browser/tabs/tab_strip_model_order_controller.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/tabs/tab_strip_model.cc
diff --git a/chrome/browser/tabs/tab_strip_model.cc b/chrome/browser/tabs/tab_strip_model.cc
index d6e5bc1d7810f1acbe183eaa6b84033d46477b9f..b58eb9036af8167c7f3117ac0500a11b96077c60 100644
--- a/chrome/browser/tabs/tab_strip_model.cc
+++ b/chrome/browser/tabs/tab_strip_model.cc
@@ -141,8 +141,6 @@ void TabStripModel::InsertTabContentsAt(int index,
}
// Anything opened by a link we deem to have an opener.
data->SetGroup(&selected_contents->controller());
- // TODO(sky): nuke when we figure out what is causing 34135.
- CHECK(data->opener != &(contents->controller()));
} else if ((add_types & ADD_INHERIT_OPENER) && selected_contents) {
if (foreground) {
// Forget any existing relationships, we don't want to make things too
@@ -150,8 +148,6 @@ void TabStripModel::InsertTabContentsAt(int index,
ForgetAllOpeners();
}
data->opener = &selected_contents->controller();
- // TODO(sky): nuke when we figure out what is causing 34135.
- CHECK(data->opener != &(contents->controller()));
}
contents_data_.insert(contents_data_.begin() + index, data);
@@ -213,12 +209,7 @@ TabContentsWrapper* TabStripModel::DetachTabContentsAt(int index) {
DCHECK(ContainsIndex(index));
TabContentsWrapper* removed_contents = GetContentsAt(index);
- // TODO(sky): nuke reason and old_data when we figure out what is causing
- // 34135.
- volatile int reason = 0;
- int next_selected_index =
- order_controller_->DetermineNewSelectedIndex(index, &reason);
- volatile TabContentsData old_data = *contents_data_.at(index);
+ int next_selected_index = order_controller_->DetermineNewSelectedIndex(index);
delete contents_data_.at(index);
contents_data_.erase(contents_data_.begin() + index);
ForgetOpenersAndGroupsReferencing(&(removed_contents->controller()));
« no previous file with comments | « no previous file | chrome/browser/tabs/tab_strip_model_order_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698