diff --git a/atom/browser/ui/win/notify_icon.cc b/atom/browser/ui/win/notify_icon.cc index a360c92cc4b9..a82ac36c7acb 100644 --- a/atom/browser/ui/win/notify_icon.cc +++ b/atom/browser/ui/win/notify_icon.cc @@ -134,7 +134,7 @@ void NotifyIcon::DisplayBalloon(HICON icon, void NotifyIcon::PopUpContextMenu(const gfx::Point& pos, ui::SimpleMenuModel* menu_model) { // Returns if context menu isn't set. - if (!menu_model && !menu_model_) + if (menu_model == nullptr && menu_model_ == nullptr) return; // Set our window as the foreground window, so the context menu closes when @@ -148,7 +148,7 @@ void NotifyIcon::PopUpContextMenu(const gfx::Point& pos, rect.set_origin(gfx::Screen::GetScreen()->GetCursorScreenPoint()); views::MenuRunner menu_runner( - menu_model ? menu_model : menu_model_, + menu_model != nullptr ? menu_model : menu_model_, views::MenuRunner::CONTEXT_MENU | views::MenuRunner::HAS_MNEMONICS); ignore_result(menu_runner.RunMenuAt( NULL, NULL, rect, views::MENU_ANCHOR_TOPLEFT, ui::MENU_SOURCE_MOUSE));