From 53092cfb7cde675c4723a00ab171550b63eb36fe Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Tue, 3 Jun 2014 14:11:12 +0800
Subject: [PATCH] win: Fix context menu clicking in notify icon.

---
 atom/browser/ui/win/notify_icon.cc | 6 +++---
 atom/browser/ui/win/notify_icon.h  | 2 ++
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/atom/browser/ui/win/notify_icon.cc b/atom/browser/ui/win/notify_icon.cc
index 86ce15d698ee..fddee1cea406 100644
--- a/atom/browser/ui/win/notify_icon.cc
+++ b/atom/browser/ui/win/notify_icon.cc
@@ -4,8 +4,8 @@
 
 #include "atom/browser/ui/win/notify_icon.h"
 
-#include "atom/browser/ui/win/menu_2.h"
 #include "atom/browser/ui/win/notify_icon_host.h"
+#include "atom/browser/ui/win/menu_2.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/win/windows_version.h"
@@ -60,8 +60,8 @@ void NotifyIcon::HandleClickEvent(const gfx::Point& cursor_pos,
   if (!SetForegroundWindow(window_))
     return;
 
-  scoped_ptr<Menu2> menu(new Menu2(menu_model_));
-  menu->RunContextMenuAt(cursor_pos);
+  menu_.reset(new Menu2(menu_model_));
+  menu_->RunContextMenuAt(cursor_pos);
 }
 
 void NotifyIcon::ResetIcon() {
diff --git a/atom/browser/ui/win/notify_icon.h b/atom/browser/ui/win/notify_icon.h
index d76960ad4925..51e854b802e2 100644
--- a/atom/browser/ui/win/notify_icon.h
+++ b/atom/browser/ui/win/notify_icon.h
@@ -22,6 +22,7 @@ class Point;
 
 namespace atom {
 
+class Menu2;
 class NotifyIconHost;
 
 class NotifyIcon : public TrayIcon {
@@ -68,6 +69,7 @@ class NotifyIcon : public TrayIcon {
 
   // The context menu.
   ui::SimpleMenuModel* menu_model_;
+  scoped_ptr<atom::Menu2> menu_;
 
   DISALLOW_COPY_AND_ASSIGN(NotifyIcon);
 };