summaryrefslogtreecommitdiffstats
path: root/ui/views/view_model.cc
diff options
context:
space:
mode:
authorsky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-04-25 17:36:44 +0000
committersky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-04-25 17:36:44 +0000
commit7be81ff2ac3306784dc9d24973b9ac02fb68e011 (patch)
treec89f1b500c3311243da37a32c2f71465ddbc9181 /ui/views/view_model.cc
parentfde2649e8c7a4e2d74cca52c4d43922f81e9f2fa (diff)
downloadchromium_src-7be81ff2ac3306784dc9d24973b9ac02fb68e011.zip
chromium_src-7be81ff2ac3306784dc9d24973b9ac02fb68e011.tar.gz
chromium_src-7be81ff2ac3306784dc9d24973b9ac02fb68e011.tar.bz2
Attempt 3 at a better touch tabstrip. There is still a bunch to do,
but this gets things in a better state. BUG=123274 TEST=covered by unit tests. R=ben@chromium.org Review URL: https://chromiumcodereview.appspot.com/10213011 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@133930 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/views/view_model.cc')
-rw-r--r--ui/views/view_model.cc3
1 files changed, 3 insertions, 0 deletions
diff --git a/ui/views/view_model.cc b/ui/views/view_model.cc
index 8ce2474..0f18ad5 100644
--- a/ui/views/view_model.cc
+++ b/ui/views/view_model.cc
@@ -17,6 +17,8 @@ ViewModel::~ViewModel() {
}
void ViewModel::Add(View* view, int index) {
+ DCHECK_LE(index, static_cast<int>(entries_.size()));
+ DCHECK_GE(index, 0);
Entry entry;
entry.view = view;
entries_.insert(entries_.begin() + index, entry);
@@ -26,6 +28,7 @@ void ViewModel::Remove(int index) {
if (index == -1)
return;
+ check_index(index);
entries_.erase(entries_.begin() + index);
}