summaryrefslogtreecommitdiffstats
path: root/views
diff options
context:
space:
mode:
authorsky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-08-19 22:26:39 +0000
committersky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-08-19 22:26:39 +0000
commita738ccd6ecebdbd7ee794e7e88a4d78804b84a7c (patch)
treeecca695b7376e0f03ebf88f1c6efee1ba1109a0c /views
parent87e1fb11e6cd71189d3a458bf11e1831d4a9dc8e (diff)
downloadchromium_src-a738ccd6ecebdbd7ee794e7e88a4d78804b84a7c.zip
chromium_src-a738ccd6ecebdbd7ee794e7e88a4d78804b84a7c.tar.gz
chromium_src-a738ccd6ecebdbd7ee794e7e88a4d78804b84a7c.tar.bz2
Converts a DCHECK into a CHECK in hopes of tracking why the menu code
thinks the current menu is NULL. BUG=93471 TEST=none R=ben@chromium.org Review URL: http://codereview.chromium.org/7686001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@97521 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views')
-rw-r--r--views/controls/menu/menu_controller.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/views/controls/menu/menu_controller.cc b/views/controls/menu/menu_controller.cc
index 425f315..1a3d7bd 100644
--- a/views/controls/menu/menu_controller.cc
+++ b/views/controls/menu/menu_controller.cc
@@ -785,7 +785,8 @@ void MenuController::SetSelection(MenuItemView* menu_item,
if (menu_item && menu_item->GetDelegate())
menu_item->GetDelegate()->SelectionChanged(menu_item);
- DCHECK(menu_item || (selection_types & SELECTION_EXIT) != 0);
+ // TODO(sky): convert back to DCHECK when figure out 93471.
+ CHECK(menu_item || (selection_types & SELECTION_EXIT) != 0);
pending_state_.item = menu_item;
pending_state_.submenu_open = (selection_types & SELECTION_OPEN_SUBMENU) != 0;