views: Fix a bunch of dchecks.

chrome/browser/ui/views/bookmarks/bookmark_context_menu_controller_views.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/views/bookmarks/bookmark_context_menu_controller_views.h"
 
 #include "base/compiler_specific.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/bookmarks/bookmark_editor.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
@@ skipping 166 matching lines @@
       bookmark_utils::PasteFromClipboard(model, paste_target, index);
       break;
     }
 
     default:
       NOTREACHED();
   }
 }
 
 bool BookmarkContextMenuControllerViews::IsItemChecked(int id) const {
-  DCHECK(id == IDC_BOOKMARK_BAR_ALWAYS_SHOW);
+  DCHECK_EQ(IDC_BOOKMARK_BAR_ALWAYS_SHOW, id);

[akalin, 2012/10/14 09:30:11]

please preserve the order of the arguments (e.g., 'id' should go on the left)

here and everywhere else

[tfarina, 2012/10/14 22:26:17]

No, unless I'm wrong, Peter advocates that it's DCHECK_EQ(expected, actual). So
I read constants like IDC_BOOKMARK_BAR_ALWAYS_SHOW as expected, and variables as
actual.

   return profile_->GetPrefs()->GetBoolean(prefs::kShowBookmarkBar);
 }
 
 bool BookmarkContextMenuControllerViews::IsCommandEnabled(int id) const {
   bool is_root_node = selection_.size() == 1 &&
                       selection_[0]->parent() == model_->root_node();
   bool can_edit =
       profile_->GetPrefs()->GetBoolean(prefs::kEditBookmarksEnabled);
   IncognitoModePrefs::Availability incognito_avail =
       IncognitoModePrefs::GetAvailability(profile_->GetPrefs());
@@ skipping 115 matching lines @@
 void BookmarkContextMenuControllerViews::BookmarkModelChanged() {
   delegate_->CloseMenu();
 }
 
 BookmarkModel* BookmarkContextMenuControllerViews::RemoveModelObserver() {
   BookmarkModel* model = model_;
   model_->RemoveObserver(this);
   model_ = NULL;
   return model;
 }