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

ui/gfx/win/hwnd_util.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 "ui/base/win/hwnd_util.h"
+#include "ui/gfx/win/hwnd_util.h"
 
 #include "base/i18n/rtl.h"
 #include "base/strings/string_util.h"
 #include "base/win/metro.h"
 #include "base/win/win_util.h"
 #include "ui/gfx/point.h"
 #include "ui/gfx/rect.h"
 #include "ui/gfx/size.h"
 
-namespace ui {
+namespace gfx {
 
 namespace {
 
 // Adjust the window to fit.
 void AdjustWindowToFit(HWND hwnd, const RECT& bounds, bool fit_to_monitor) {
   if (fit_to_monitor) {
     // Get the monitor.
     HMONITOR hmon = MonitorFromRect(&bounds, MONITOR_DEFAULTTONEAREST);
     if (hmon) {
       MONITORINFO mi;
       mi.cbSize = sizeof(mi);
       base::win::GetMonitorInfoWrapper(hmon, &mi);
-      gfx::Rect window_rect(bounds);
-      gfx::Rect monitor_rect(mi.rcWork);
-      gfx::Rect new_window_rect = window_rect;
+      Rect window_rect(bounds);
+      Rect monitor_rect(mi.rcWork);
+      Rect new_window_rect = window_rect;
       new_window_rect.AdjustToFit(monitor_rect);
       if (new_window_rect != window_rect) {
         // Window doesn't fit on monitor, move and possibly resize.
         SetWindowPos(hwnd, 0, new_window_rect.x(), new_window_rect.y(),
                      new_window_rect.width(), new_window_rect.height(),
                      SWP_NOACTIVATE | SWP_NOZORDER);
         return;
       }
       // Else fall through.
     } else {
@@ skipping 67 matching lines @@
   HWND top_window = ::GetAncestor(window, GA_ROOT);
   if (!top_window)
     return false;
 
   HWND active_top_window = ::GetAncestor(::GetForegroundWindow(), GA_ROOT);
   return (top_window == active_top_window);
 }
 
 void CenterAndSizeWindow(HWND parent,
                          HWND window,
-                         const gfx::Size& pref) {
+                         const Size& pref) {
   DCHECK(window && pref.width() > 0 && pref.height() > 0);
 
   // Calculate the ideal bounds.
   RECT window_bounds;
   RECT center_bounds = {0};
   if (parent) {
     // If there is a parent, center over the parents bounds.
     ::GetWindowRect(parent, &center_bounds);
   }
 
@@ skipping 41 matching lines @@
 }
 
 void CheckWindowCreated(HWND hwnd) {
   if (!hwnd)
     LOG_GETLASTERROR(FATAL);
 }
 
 void ShowSystemMenu(HWND window) {
   RECT rect;
   GetWindowRect(window, &rect);
-  gfx::Point point = gfx::Point(rect.left, rect.top);
+  Point point = Point(rect.left, rect.top);
   static const int kSystemMenuOffset = 10;
   point.Offset(kSystemMenuOffset, kSystemMenuOffset);
   ShowSystemMenuAtPoint(window, point);
 }
 
-void ShowSystemMenuAtPoint(HWND window, const gfx::Point& point) {
+void ShowSystemMenuAtPoint(HWND window, const Point& point) {
   // In the Metro process, we never want to show the system menu.
   if (base::win::IsMetroProcess())
     return;
   UINT flags = TPM_LEFTBUTTON | TPM_RIGHTBUTTON | TPM_RETURNCMD;
   if (base::i18n::IsRTL())
     flags |= TPM_RIGHTALIGN;
   HMENU menu = GetSystemMenu(window, FALSE);
   const int command =
       TrackPopupMenu(menu, flags, point.x(), point.y(), 0, window, NULL);
   if (command)
     SendMessage(window, WM_SYSCOMMAND, command, 0);
 }
 
 extern "C" {
   typedef HWND (*RootWindow)();
 }
 
 HWND GetWindowToParentTo(bool get_real_hwnd) {
   HMODULE metro = base::win::GetMetroModule();
   if (!metro)
     return get_real_hwnd ? ::GetDesktopWindow() : HWND_DESKTOP;
   // In windows 8 metro-mode the root window is not the desktop.
   RootWindow root_window =
       reinterpret_cast<RootWindow>(::GetProcAddress(metro, "GetRootWindow"));
   return root_window();
 }
 
-}  // namespace ui
+}  // namespace gfx