win: Remove NotifyIconHostStateChanger

We don't need the ability it provided, and it is causing crashes on some
machines.

Fixes #850.

atom/browser/ui/win/notify_icon.cc

@@ -100,8 +100,6 @@ void NotifyIcon::SetImage(const gfx::ImageSkia& image) {
   BOOL result = Shell_NotifyIcon(NIM_MODIFY, &icon_data);
   if (!result)
     LOG(WARNING) << "Error setting status tray icon image";
-  else
-    host_->UpdateIconVisibilityInBackground(this);
 }
 
 void NotifyIcon::SetPressedImage(const gfx::ImageSkia& image) {

atom/browser/ui/win/notify_icon_host.cc

@@ -12,7 +12,6 @@
 #include "base/threading/non_thread_safe.h"
 #include "base/threading/thread.h"
 #include "base/win/wrapped_window_proc.h"
-#include "chrome/browser/ui/views/status_icons/status_tray_state_changer_win.h"
 #include "ui/gfx/screen.h"
 #include "ui/gfx/win/hwnd_util.h"
 
@@ -29,68 +28,6 @@ const wchar_t kNotifyIconHostWindowClass[] = L"AtomShell_NotifyIconHostWindow";
 
 }  // namespace
 
-// Default implementation for NotifyIconHostStateChangerProxy that communicates
-// to Exporer.exe via COM.  It spawns a background thread with a fresh COM
-// apartment and requests that the visibility be increased unless the user
-// has explicitly set the icon to be hidden.
-class NotifyIconHostStateChangerProxyImpl
-    : public NotifyIconHostStateChangerProxy,
-      public base::NonThreadSafe {
- public:
-  NotifyIconHostStateChangerProxyImpl()
-      : pending_requests_(0),
-        worker_thread_("NotifyIconCOMWorkerThread"),
-        weak_factory_(this) {
-    worker_thread_.init_com_with_mta(false);
-  }
-
-  virtual void EnqueueChange(UINT icon_id, HWND window) OVERRIDE {
-    DCHECK(CalledOnValidThread());
-    if (pending_requests_ == 0)
-      worker_thread_.Start();
-
-    ++pending_requests_;
-    worker_thread_.message_loop_proxy()->PostTaskAndReply(
-        FROM_HERE,
-        base::Bind(
-            &NotifyIconHostStateChangerProxyImpl::EnqueueChangeOnWorkerThread,
-            icon_id,
-            window),
-        base::Bind(&NotifyIconHostStateChangerProxyImpl::ChangeDone,
-                   weak_factory_.GetWeakPtr()));
-  }
-
- private:
-  // Must be called only on |worker_thread_|, to ensure the correct COM
-  // apartment.
-  static void EnqueueChangeOnWorkerThread(UINT icon_id, HWND window) {
-    // It appears that IUnknowns are coincidentally compatible with
-    // scoped_refptr.  Normally I wouldn't depend on that but it seems that
-    // base::win::IUnknownImpl itself depends on that coincidence so it's
-    // already being assumed elsewhere.
-    scoped_refptr<StatusTrayStateChangerWin> status_tray_state_changer(
-        new StatusTrayStateChangerWin(icon_id, window));
-    status_tray_state_changer->EnsureTrayIconVisible();
-  }
-
-  // Called on UI thread.
-  void ChangeDone() {
-    DCHECK(CalledOnValidThread());
-    DCHECK_GT(pending_requests_, 0);
-
-    if (--pending_requests_ == 0)
-      worker_thread_.Stop();
-  }
-
- private:
-  int pending_requests_;
-  base::Thread worker_thread_;
-  base::WeakPtrFactory<NotifyIconHostStateChangerProxyImpl> weak_factory_;
-
-  DISALLOW_COPY_AND_ASSIGN(NotifyIconHostStateChangerProxyImpl);
-};
-
-
 NotifyIconHost::NotifyIconHost()
     : next_icon_id_(1),
       atom_(0),
@@ -151,15 +88,6 @@ void NotifyIconHost::Remove(NotifyIcon* icon) {
   notify_icons_.erase(i);
 }
 
-void NotifyIconHost::UpdateIconVisibilityInBackground(
-    NotifyIcon* notify_icon) {
-  if (!state_changer_proxy_.get())
-    state_changer_proxy_.reset(new NotifyIconHostStateChangerProxyImpl);
-
-  state_changer_proxy_->EnqueueChange(notify_icon->icon_id(),
-                                      notify_icon->window());
-}
-
 LRESULT CALLBACK NotifyIconHost::WndProcStatic(HWND hwnd,
                                               UINT message,
                                               WPARAM wparam,

atom/browser/ui/win/notify_icon_host.h

@@ -16,16 +16,6 @@ namespace atom {
 
 class NotifyIcon;
 
-// A class that's responsible for increasing, if possible, the visibility
-// of a status tray icon on the taskbar. The default implementation sends
-// a task to a worker thread each time EnqueueChange is called.
-class NotifyIconHostStateChangerProxy {
- public:
-  // Called by NotifyIconHost to request upgraded visibility on the icon
-  // represented by the |icon_id|, |window| pair.
-  virtual void EnqueueChange(UINT icon_id, HWND window) = 0;
-};
-
 class NotifyIconHost {
  public:
   NotifyIconHost();
@@ -34,8 +24,6 @@ class NotifyIconHost {
   NotifyIcon* CreateNotifyIcon();
   void Remove(NotifyIcon* notify_icon);
 
-  void UpdateIconVisibilityInBackground(NotifyIcon* notify_icon);
-
  private:
   typedef std::vector<NotifyIcon*> NotifyIcons;
 
@@ -67,10 +55,6 @@ class NotifyIconHost {
   // reset our status icons.
   UINT taskbar_created_message_;
 
-  // Manages changes performed on a background thread to manipulate visibility
-  // of notification icons.
-  scoped_ptr<NotifyIconHostStateChangerProxy> state_changer_proxy_;
-
   DISALLOW_COPY_AND_ASSIGN(NotifyIconHost);
 };