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

ui/gfx/win/window_impl.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/window_impl.h"
+#include "ui/gfx/win/window_impl.h"
 
 #include <list>
 
 #include "base/debug/alias.h"
 #include "base/memory/singleton.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/synchronization/lock.h"
 #include "base/win/wrapped_window_proc.h"
-#include "ui/base/win/hwnd_util.h"
+#include "ui/gfx/win/hwnd_util.h"
 
-namespace ui {
+namespace gfx {
 
 static const DWORD kWindowDefaultChildStyle =
     WS_CHILD | WS_VISIBLE | WS_CLIPCHILDREN | WS_CLIPSIBLINGS;
 static const DWORD kWindowDefaultStyle = WS_OVERLAPPEDWINDOW | WS_CLIPCHILDREN;
 static const DWORD kWindowDefaultExStyle = 0;
 
 ///////////////////////////////////////////////////////////////////////////////
 // WindowImpl class tracking.
 
 // Several external scripts rely explicitly on this base class name for
@@ skipping 115 matching lines @@
       got_valid_hwnd_(false),
       destroyed_(NULL) {
 }
 
 WindowImpl::~WindowImpl() {
   if (destroyed_)
     *destroyed_ = true;
   ClearUserData();
 }
 
-void WindowImpl::Init(HWND parent, const gfx::Rect& bounds) {
+void WindowImpl::Init(HWND parent, const Rect& bounds) {
   if (window_style_ == 0)
     window_style_ = parent ? kWindowDefaultChildStyle : kWindowDefaultStyle;
 
   if (parent == HWND_DESKTOP) {
     // Only non-child windows can have HWND_DESKTOP (0) as their parent.
     CHECK((window_style_ & WS_CHILD) == 0);
     parent = GetWindowToParentTo(false);
   } else if (parent == ::GetDesktopWindow()) {
     // Any type of window can have the "Desktop Window" as their parent.
     parent = GetWindowToParentTo(true);
@@ skipping 46 matching lines @@
         base::win::WrappedWindowProc<&WindowImpl::WndProc>;
     base::debug::Alias(&procs_match);
     CHECK(false);
   }
   if (!destroyed)
     destroyed_ = NULL;
 
   CheckWindowCreated(hwnd_);
 
   // The window procedure should have set the data for us.
-  CHECK_EQ(this, ui::GetWindowUserData(hwnd));
+  CHECK_EQ(this, GetWindowUserData(hwnd));
 }
 
 HICON WindowImpl::GetDefaultWindowIcon() const {
   return NULL;
 }
 
 LRESULT WindowImpl::OnWndProc(UINT message, WPARAM w_param, LPARAM l_param) {
   LRESULT result = 0;
 
   // Handle the message if it's in our message map; otherwise, let the system
   // handle it.
   if (!ProcessWindowMessage(hwnd_, message, w_param, l_param, result))
     result = DefWindowProc(hwnd_, message, w_param, l_param);
 
   return result;
 }
 
 void WindowImpl::ClearUserData() {
   if (::IsWindow(hwnd_))
-    ui::SetWindowUserData(hwnd_, NULL);
+    gfx::SetWindowUserData(hwnd_, NULL);
 }
 
 // static
 LRESULT CALLBACK WindowImpl::WndProc(HWND hwnd,
                                      UINT message,
                                      WPARAM w_param,
                                      LPARAM l_param) {
   if (message == WM_NCCREATE) {
     CREATESTRUCT* cs = reinterpret_cast<CREATESTRUCT*>(l_param);
     WindowImpl* window = reinterpret_cast<WindowImpl*>(cs->lpCreateParams);
     DCHECK(window);
-    ui::SetWindowUserData(hwnd, window);
+    gfx::SetWindowUserData(hwnd, window);
     window->hwnd_ = hwnd;
     window->got_create_ = true;
     if (hwnd)
       window->got_valid_hwnd_ = true;
     return TRUE;
   }
 
-  WindowImpl* window = reinterpret_cast<WindowImpl*>(
-      ui::GetWindowUserData(hwnd));
+  WindowImpl* window = reinterpret_cast<WindowImpl*>(GetWindowUserData(hwnd));
   if (!window)
     return 0;
 
   return window->OnWndProc(message, w_param, l_param);
 }
 
 ATOM WindowImpl::GetWindowClassAtom() {
   HICON icon = GetDefaultWindowIcon();
   ClassInfo class_info(initial_class_style(), icon);
   return ClassRegistrar::GetInstance()->RetrieveClassAtom(class_info);
 }
 
-}  // namespace ui
+}  // namespace gfx