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

chrome/browser/ui/views/infobars/infobar_view.cc

Index: chrome/browser/ui/views/infobars/infobar_view.cc
diff --git a/chrome/browser/ui/views/infobars/infobar_view.cc b/chrome/browser/ui/views/infobars/infobar_view.cc
index 0936c950b822d668c0176214c5b88ee13783d71e..a791d1cd888eb0452f1a280f8ff1e3168f7add6e 100644
--- a/chrome/browser/ui/views/infobars/infobar_view.cc
+++ b/chrome/browser/ui/views/infobars/infobar_view.cc
@@ -38,8 +38,8 @@
 #if defined(OS_WIN)
 #include "base/win/win_util.h"
 #include "base/win/windows_version.h"
-#include "ui/base/win/hwnd_util.h"
 #include "ui/gfx/icon_util.h"
+#include "ui/gfx/win/hwnd_util.h"
 #endif
 
 // static
@@ -340,7 +340,7 @@ void InfoBarView::PlatformSpecificHide(bool animate) {
   // Do not restore focus (and active state with it) if some other top-level
   // window became active.
   views::Widget* widget = GetWidget();
-  if (!widget || ui::DoesWindowBelongToActiveWindow(widget->GetNativeView()))
+  if (!widget || gfx::DoesWindowBelongToActiveWindow(widget->GetNativeView()))
     FocusLastFocusedExternalView();
 #endif
 }