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

1 files changed, 13 insertions, 0 deletions

diff --git a/ui/views/view_model.h b/ui/views/view_model.h
index 6a68fb1..2493878 100644
--- a/ui/views/view_model.h
+++ b/ui/views/view_model.h
@@ -9,6 +9,7 @@
 #include <vector>
 
 #include "base/basictypes.h"
+#include "base/logging.h"
 #include "ui/gfx/rect.h"
 #include "ui/views/views_export.h"
 
@@ -46,14 +47,17 @@ class VIEWS_EXPORT ViewModel {
 
   // Returns the view at the specified index.
   View* view_at(int index) const {
+    check_index(index);
     return entries_[index].view;
   }
 
   void set_ideal_bounds(int index, const gfx::Rect& bounds) {
+    check_index(index);
     entries_[index].ideal_bounds = bounds;
   }
 
   const gfx::Rect& ideal_bounds(int index) const {
+    check_index(index);
     return entries_[index].ideal_bounds;
   }
 
@@ -70,6 +74,15 @@ class VIEWS_EXPORT ViewModel {
   };
   typedef std::vector<Entry> Entries;
 
+#if !defined(NDEBUG)
+  void check_index(int index) const {
+    DCHECK_LT(index, static_cast<int>(entries_.size()));
+    DCHECK_GE(index, 0);
+  }
+#else
+  void check_index(int index) const {}
+#endif
+
   Entries entries_;
 
   DISALLOW_COPY_AND_ASSIGN(ViewModel);