Index: ash/root_window_controller.cc |
diff --git a/ash/root_window_controller.cc b/ash/root_window_controller.cc |
index 67ab213320f96b239de97e6a034ebebfda191bf1..bbd611e11dc3d9765c0ce49453c863d85087d85e 100644 |
--- a/ash/root_window_controller.cc |
+++ b/ash/root_window_controller.cc |
@@ -487,6 +487,8 @@ void RootWindowController::ShowContextMenu( |
DCHECK(Shell::GetInstance()->delegate()); |
scoped_ptr<ui::MenuModel> menu_model( |
Shell::GetInstance()->delegate()->CreateContextMenu(target)); |
+ if (!menu_model.get()) |
+ return; |
views::MenuModelAdapter menu_model_adapter(menu_model.get()); |
views::MenuRunner menu_runner(menu_model_adapter.CreateMenu()); |