| Index: ash/root_window_controller.cc
|
| diff --git a/ash/root_window_controller.cc b/ash/root_window_controller.cc
|
| index d50bbe9cb3fb8d491a43e05e6ad1db34a9ea9080..74819831922992d726b479a81f85fdaeb2c082ab 100644
|
| --- a/ash/root_window_controller.cc
|
| +++ b/ash/root_window_controller.cc
|
| @@ -491,6 +491,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());
|
|
|