summaryrefslogtreecommitdiffstats
path: root/app
diff options
context:
space:
mode:
authoroshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-04-06 08:02:42 +0000
committeroshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-04-06 08:02:42 +0000
commitf07d7bfb75a35d89075e6b88ace6ccfb76cbe97b (patch)
treed650fed9834d5a7468321ace5cc4502c728a7caa /app
parenta67e851f7913d42e4e550062d23779acec333aab (diff)
downloadchromium_src-f07d7bfb75a35d89075e6b88ace6ccfb76cbe97b.zip
chromium_src-f07d7bfb75a35d89075e6b88ace6ccfb76cbe97b.tar.gz
chromium_src-f07d7bfb75a35d89075e6b88ace6ccfb76cbe97b.tar.bz2
Enable interactive_ui_tests
* changed DCHECK in tree_node_model to make it easy to find how it failed. * Fixed compilation error in find_bar_host_interactive_uitest.cc on linux/views. * Disabled BrowserKeyEventsTest.AccessKeys for Chromeos Added/Changed ui_test_utils::RunAllPendingInMessageLoop where necessary. * Disabled tab_dragging_tests. I included the source so that we can catch compilation error even if tests do not run. Changed the comment from // -> /* as GCC complains the use of "\" (and potentially dangerous) * Added SleepInMessageLoop to allow event loop to execute the tasks/events while waiting. * For RunAllPendingInMessageLoop change, please see http://codereview.chromium.org/1591004 BUG=39736 TEST=interactive_ui_tests should pass with following cls http://codereview.chromium.org/1594003 http://codereview.chromium.org/1545011. Review URL: http://codereview.chromium.org/1576008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@43701 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'app')
-rw-r--r--app/tree_node_model.h7
1 files changed, 5 insertions, 2 deletions
diff --git a/app/tree_node_model.h b/app/tree_node_model.h
index 0d9f2b9..b11bf38 100644
--- a/app/tree_node_model.h
+++ b/app/tree_node_model.h
@@ -82,7 +82,9 @@ class TreeNode : public TreeModelNode {
// Adds the specified child node.
virtual void Add(int index, NodeType* child) {
- DCHECK(child && index >= 0 && index <= GetChildCount());
+ DCHECK(child);
+ DCHECK_LE(0, index);
+ DCHECK_GE(GetChildCount(), index);
// If the node has a parent, remove it from its parent.
NodeType* node_parent = child->GetParent();
if (node_parent)
@@ -130,7 +132,8 @@ class TreeNode : public TreeModelNode {
return children_[index];
}
const NodeType* GetChild(int index) const {
- DCHECK(index >= 0 && index < GetChildCount());
+ DCHECK_LE(0, index);
+ DCHECK_GT(GetChildCount(), index);
return children_[index];
}