Move a bunch of windows stuff from ui/base/win to ui/gfx/win

chrome/browser/ui/views/status_icons/status_tray_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_tray_win.h"
 
 #include <commctrl.h>
 
 #include "base/win/wrapped_window_proc.h"
 #include "chrome/browser/ui/views/status_icons/status_icon_win.h"
 #include "chrome/common/chrome_constants.h"
-#include "ui/base/win/hwnd_util.h"
 #include "ui/gfx/screen.h"
+#include "ui/gfx/win/hwnd_util.h"
 #include "win8/util/win8_util.h"
 
 static const UINT kStatusIconMessage = WM_APP + 1;
 
 namespace {
 // |kBaseIconId| is 2 to avoid conflicts with plugins that hard-code id 1.
 const UINT kBaseIconId = 2;
 
 UINT ReservedIconId(StatusTray::StatusIconType type) {
   return kBaseIconId + static_cast<UINT>(type);
@@ skipping 19 matching lines @@
   // If the taskbar is re-created after we start up, we have to rebuild all of
   // our icons.
   taskbar_created_message_ = RegisterWindowMessage(TEXT("TaskbarCreated"));
 
   // Create an offscreen window for handling messages for the status icons. We
   // create a hidden WS_POPUP window instead of an HWND_MESSAGE window, because
   // only top-level windows such as popups can receive broadcast messages like
   // "TaskbarCreated".
   window_ = CreateWindow(MAKEINTATOM(atom_),
                          0, WS_POPUP, 0, 0, 0, 0, 0, 0, instance_, 0);
-  ui::CheckWindowCreated(window_);
-  ui::SetWindowUserData(window_, this);
+  gfx::CheckWindowCreated(window_);
+  gfx::SetWindowUserData(window_, this);
 }
 
 LRESULT CALLBACK StatusTrayWin::WndProcStatic(HWND hwnd,
                                               UINT message,
                                               WPARAM wparam,
                                               LPARAM lparam) {
   StatusTrayWin* msg_wnd = reinterpret_cast<StatusTrayWin*>(
       GetWindowLongPtr(hwnd, GWLP_USERDATA));
   if (msg_wnd)
     return msg_wnd->WndProc(hwnd, message, wparam, lparam);
@@ skipping 82 matching lines @@
 }
 
 UINT StatusTrayWin::NextIconId() {
   UINT icon_id = next_icon_id_++;
   return kBaseIconId + static_cast<UINT>(NAMED_STATUS_ICON_COUNT) + icon_id;
 }
 
 StatusTray* StatusTray::Create() {
   return new StatusTrayWin();
 }