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

Unified Diff: ash/root_window_controller.cc

Issue 12077055: Made launcher hidden when kicking off chrome in app mode. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 11 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
« no previous file with comments | « no previous file | ash/shelf_types.h » ('j') | chrome/browser/ui/ash/ash_init.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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());
« no previous file with comments | « no previous file | ash/shelf_types.h » ('j') | chrome/browser/ui/ash/ash_init.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698