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

Unified Diff: chrome/browser/ui/views/bookmarks/bookmark_editor_view.cc

Issue 11148007: views: Fix a bunch of dchecks. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fixes Created 8 years, 2 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
Index: chrome/browser/ui/views/bookmarks/bookmark_editor_view.cc
diff --git a/chrome/browser/ui/views/bookmarks/bookmark_editor_view.cc b/chrome/browser/ui/views/bookmarks/bookmark_editor_view.cc
index d4ebe4025d77aedb997f51b434d7f7dddb32bb8d..62724019812c71831cc2cc90b07ba90472c45f5e 100644
--- a/chrome/browser/ui/views/bookmarks/bookmark_editor_view.cc
+++ b/chrome/browser/ui/views/bookmarks/bookmark_editor_view.cc
@@ -250,7 +250,7 @@ void BookmarkEditorView::ExecuteCommand(int command_id) {
}
tree_model_->Remove(node->parent(), node);
} else {
- DCHECK(command_id == IDS_BOOKMARK_EDITOR_NEW_FOLDER_MENU_ITEM);
+ DCHECK_EQ(IDS_BOOKMARK_EDITOR_NEW_FOLDER_MENU_ITEM, command_id);
NewFolder();
}
}
@@ -274,7 +274,7 @@ void BookmarkEditorView::Close() {
void BookmarkEditorView::ShowContextMenuForView(views::View* source,
const gfx::Point& point) {
- DCHECK(source == tree_view_);
+ DCHECK_EQ(tree_view_, source);
if (!tree_view_->GetSelectedNode())
return;
running_menu_for_root_ =
@@ -524,10 +524,10 @@ BookmarkEditorView::EditorNode* BookmarkEditorView::CreateRootNode() {
const BookmarkNode* bb_root_node = bb_model_->root_node();
CreateNodes(bb_root_node, root_node);
DCHECK(root_node->child_count() >= 2 && root_node->child_count() <= 3);
- DCHECK(bb_root_node->GetChild(0)->type() == BookmarkNode::BOOKMARK_BAR);
- DCHECK(bb_root_node->GetChild(1)->type() == BookmarkNode::OTHER_NODE);
+ DCHECK_EQ(BookmarkNode::BOOKMARK_BAR, bb_root_node->GetChild(0)->type());
+ DCHECK_EQ(BookmarkNode::OTHER_NODE, bb_root_node->GetChild(1)->type());
if (root_node->child_count() == 3)
- DCHECK(bb_root_node->GetChild(2)->type() == BookmarkNode::MOBILE);
+ DCHECK_EQ(BookmarkNode::MOBILE, bb_root_node->GetChild(2)->type());
return root_node;
}

Powered by Google App Engine
This is Rietveld 408576698