diff options
-rw-r--r-- | chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc | 2 | ||||
-rw-r--r-- | chrome/browser/ui/views/tabs/tab_strip.cc | 3 | ||||
-rw-r--r-- | ui/views/view_model.cc | 4 |
3 files changed, 5 insertions, 4 deletions
diff --git a/chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc b/chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc index 6aedb9b..e4f195c 100644 --- a/chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc +++ b/chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc @@ -388,7 +388,7 @@ void BrowserTabStripController::TabInsertedAt(WebContents* contents, int model_index, bool is_active) { DCHECK(contents); - DCHECK(model_->ContainsIndex(model_index)); + CHECK(model_->ContainsIndex(model_index)); AddTab(contents, model_index, is_active); } diff --git a/chrome/browser/ui/views/tabs/tab_strip.cc b/chrome/browser/ui/views/tabs/tab_strip.cc index 5e40997..f4b8cfb 100644 --- a/chrome/browser/ui/views/tabs/tab_strip.cc +++ b/chrome/browser/ui/views/tabs/tab_strip.cc @@ -1638,6 +1638,7 @@ Tab* TabStrip::CreateTab() { } void TabStrip::StartInsertTabAnimation(int model_index) { + CHECK_LT(model_index, tabs_.view_size()); PrepareForAnimation(); // The TabStrip can now use its entire width to lay out Tabs. @@ -1645,7 +1646,7 @@ void TabStrip::StartInsertTabAnimation(int model_index) { available_width_for_tabs_ = -1; GenerateIdealBounds(); - + CHECK_LT(model_index, tabs_.view_size()); Tab* tab = tab_at(model_index); if (model_index == 0) { tab->SetBounds(0, ideal_bounds(model_index).y(), 0, diff --git a/ui/views/view_model.cc b/ui/views/view_model.cc index 5f492f5..c6b4672 100644 --- a/ui/views/view_model.cc +++ b/ui/views/view_model.cc @@ -17,8 +17,8 @@ ViewModel::~ViewModel() { } void ViewModel::Add(View* view, int index) { - DCHECK_LE(index, static_cast<int>(entries_.size())); - DCHECK_GE(index, 0); + CHECK_LE(index, static_cast<int>(entries_.size())); + CHECK_GE(index, 0); Entry entry; entry.view = view; entries_.insert(entries_.begin() + index, entry); |