Reland r265807: "Moves the notification icon out of th..."

chrome/browser/ui/views/status_icons/status_icon_win.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/views/status_icons/status_icon_win.h"
 
 #include "base/strings/string_number_conversions.h"
 #include "base/win/windows_version.h"
+#include "chrome/browser/ui/views/status_icons/status_tray_win.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/gfx/icon_util.h"
 #include "ui/gfx/point.h"
 #include "ui/views/controls/menu/menu_item_view.h"
 #include "ui/views/controls/menu/menu_runner.h"
 
 ////////////////////////////////////////////////////////////////////////////////
 // StatusIconWin, public:
 
-StatusIconWin::StatusIconWin(UINT id, HWND window, UINT message)
-    : icon_id_(id),
+StatusIconWin::StatusIconWin(StatusTrayWin* tray,
+                             UINT id,
+                             HWND window,
+                             UINT message)
+    : tray_(tray),
+      icon_id_(id),
       window_(window),
       message_id_(message),
       menu_model_(NULL) {
   NOTIFYICONDATA icon_data;
   InitIconData(&icon_data);
   icon_data.uFlags = NIF_MESSAGE;
   icon_data.uCallbackMessage = message_id_;
   BOOL result = Shell_NotifyIcon(NIM_ADD, &icon_data);
   // This can happen if the explorer process isn't running when we try to
   // create the icon for some reason (for example, at startup).
@@ skipping 105 matching lines @@
       icon_data.uFlags |= NIF_ICON;
       icon_data.dwInfoFlags = NIIF_USER;
     }
   }
 
   BOOL result = Shell_NotifyIcon(NIM_MODIFY, &icon_data);
   if (!result)
     LOG(WARNING) << "Unable to create status tray balloon.";
 }
 
+void StatusIconWin::ForceVisible() {
+  tray_->UpdateIconVisibilityInBackground(this);
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 // StatusIconWin, private:
 
 void StatusIconWin::UpdatePlatformContextMenu(StatusIconMenuModel* menu) {
   // |menu_model_| is about to be destroyed. Destroy the menu (which closes it)
   // so that it doesn't attempt to continue using |menu_model_|.
   menu_runner_.reset();
   DCHECK(menu);
   menu_model_ = menu;
 }
 
 void StatusIconWin::InitIconData(NOTIFYICONDATA* icon_data) {
   if (base::win::GetVersion() >= base::win::VERSION_VISTA) {
     memset(icon_data, 0, sizeof(NOTIFYICONDATA));
     icon_data->cbSize = sizeof(NOTIFYICONDATA);
   } else {
     memset(icon_data, 0, NOTIFYICONDATA_V3_SIZE);
     icon_data->cbSize = NOTIFYICONDATA_V3_SIZE;
   }
 
   icon_data->hWnd = window_;
   icon_data->uID = icon_id_;
 }