[Notification][Win] fix for missing windows events, notification manager should be initialize by UI thread

jefry-vcube · jefry-vcube · commit 92c35d363269 · 2015-03-26T18:05:57.000+08:00
diff --git a/src/nw_notification_manager_win.cc b/src/nw_notification_manager_win.cc
@@ -73,7 +73,14 @@ class TrayObserver : public StatusIconObserver {
   NotificationManagerWin* tray_;
 };
 
-NotificationManagerWin::NotificationManagerWin() : status_icon_(NULL) {
+NotificationManagerWin::NotificationManagerWin() : status_icon_(NULL), status_tray_(NULL) {
+  Init();
+}
+
+bool NotificationManagerWin::Init() {
+  if (!content::BrowserThread::CurrentlyOn(BrowserThread::UI))
+    return false;
+
   status_tray_ = static_cast<StatusTrayWin*>(StatusTray::GetSingleton());
 
   // check if status icon is already created
@@ -85,6 +92,7 @@ NotificationManagerWin::NotificationManagerWin() : status_icon_(NULL) {
     status_observer_ = new TrayObserver(this);
     status_icon->AddObserver(status_observer_);
   }
+  return true;
 }
 
 bool NotificationManagerWin::ReleaseNotification() {
@@ -123,6 +131,8 @@ NotificationManagerWin::~NotificationManagerWin() {
 
 bool NotificationManagerWin::AddDesktopNotification(const content::PlatformNotificationData& params,
   const int render_process_id, const int notification_id, const SkBitmap& bitmap_icon) {
+  
+  if (status_tray_ == NULL) Init();
 
   content::Shell* shell = content::Shell::windows()[0];
 
diff --git a/src/nw_notification_manager_win.h b/src/nw_notification_manager_win.h
@@ -45,6 +45,8 @@ class NotificationManagerWin : public NotificationManager {
   // variable to store the latest notification data, windows can only show 1 notification
   int render_process_id_, notification_id_;
 
+  bool Init();
+
   // dispatch the events from the latest notification
   bool DesktopNotificationPostClick() {
     return NotificationManager::DesktopNotificationPostClick(render_process_id_, notification_id_);
