Moves the notification icon out of the status area overflow.

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/metro.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"
-#include "win8/util/win8_util.h"
+
+// Implements AsStatusIconWin.  This is only implemented on Windows and will
+// cause a link error if the function is declared on any other platform.
+StatusIconWin* StatusIcon::AsStatusIconWin() {
+  if (StatusTrayWin::DisabledForMetroMode())
+    return NULL;
+  return (StatusIconWin*)this;
+}
 
 ////////////////////////////////////////////////////////////////////////////////
 // StatusIconWin, public:
 
 StatusIconWin::StatusIconWin(UINT id, HWND window, UINT message)
     : icon_id_(id),
       window_(window),
       message_id_(message),
       menu_model_(NULL) {
+  DCHECK(!StatusTrayWin::DisabledForMetroMode());
   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).
   if (!result)
     LOG(WARNING) << "Unable to create status tray icon.";
 }
@@ skipping 131 matching lines @@
 
   icon_data->hWnd = window_;
   icon_data->uID = icon_id_;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // StatusIconMetro
 
 StatusIconMetro::StatusIconMetro(UINT id)
     : id_(id) {
-  DCHECK(win8::IsSingleWindowMetroMode());
+  DCHECK(StatusTrayWin::DisabledForMetroMode());
 }
 
 StatusIconMetro::~StatusIconMetro() {
 }
 
 void StatusIconMetro::SetImage(const gfx::ImageSkia& image) {
   DVLOG(1) << __FUNCTION__;
 }
 
 void StatusIconMetro::SetPressedImage(const gfx::ImageSkia& image) {
@@ skipping 21 matching lines @@
     notification("", "", title.c_str(), contents.c_str(), L"",
                  base::IntToString(id_).c_str(), NULL, NULL);
   }
 }
 
 void StatusIconMetro::UpdatePlatformContextMenu(StatusIconMenuModel* menu) {
   DVLOG(1) << __FUNCTION__
            << " This functionality is not supported in Windows 8 metro";
 }