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

content/browser/renderer_host/render_widget_host_view_base.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 "content/browser/renderer_host/render_widget_host_view_base.h"
 
 #include "base/logging.h"
 #include "content/browser/accessibility/browser_accessibility_manager.h"
 #include "content/browser/gpu/gpu_data_manager_impl.h"
 #include "content/browser/renderer_host/basic_mouse_wheel_smooth_scroll_gesture.h"
@@ skipping 11 matching lines @@
 #include "base/command_line.h"
 #include "base/message_loop/message_loop.h"
 #include "base/win/wrapped_window_proc.h"
 #include "content/browser/plugin_process_host.h"
 #include "content/browser/plugin_service_impl.h"
 #include "content/common/plugin_constants_win.h"
 #include "content/common/webplugin_geometry.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/child_process_data.h"
 #include "content/public/common/content_switches.h"
-#include "ui/base/win/hwnd_util.h"
-#include "ui/gfx/dpi_win.h"
 #include "ui/gfx/gdi_util.h"
+#include "ui/gfx/win/dpi.h"
+#include "ui/gfx/win/hwnd_util.h"
 #endif
 
 #if defined(TOOLKIT_GTK)
 #include <gdk/gdkx.h>
 #include <gtk/gtk.h>
 
 #include "content/browser/renderer_host/gtk_window_utils.h"
 #endif
 
 namespace content {
@@ skipping 66 matching lines @@
         ::SendMessage(GetParent(window), message, wparam, lparam);
         return 0;
       default:
         break;
     }
   }
   return ::DefWindowProc(window, message, wparam, lparam);
 }
 
 bool IsPluginWrapperWindow(HWND window) {
-  return ui::GetClassNameW(window) ==
+  return gfx::GetClassNameW(window) ==
       string16(kWrapperNativeWindowClassName);
 }
 
 // Create an intermediate window between the given HWND and its parent.
 HWND ReparentWindow(HWND window, HWND parent) {
   static ATOM atom = 0;
   static HMODULE instance = NULL;
   if (!atom) {
     WNDCLASSEX window_class;
     base::win::InitializeWindowClass(
@@ skipping 12 matching lines @@
     instance = window_class.hInstance;
     atom = RegisterClassEx(&window_class);
   }
   DCHECK(atom);
 
   HWND new_parent = CreateWindowEx(
       WS_EX_LEFT | WS_EX_LTRREADING | WS_EX_RIGHTSCROLLBAR,
       MAKEINTATOM(atom), 0,
       WS_CHILD | WS_CLIPCHILDREN | WS_CLIPSIBLINGS,
       0, 0, 0, 0, parent, 0, instance, 0);
-  ui::CheckWindowCreated(new_parent);
+  gfx::CheckWindowCreated(new_parent);
   ::SetParent(window, new_parent);
   // How many times we try to find a PluginProcessHost whose process matches
   // the HWND.
   static const int kMaxTries = 5;
   BrowserThread::PostTask(
       BrowserThread::IO,
       FROM_HERE,
       base::Bind(&NotifyPluginProcessHostHelper, window, new_parent,
                  kMaxTries));
   return new_parent;
@@ skipping 398 matching lines @@
 
 uint32 RenderWidgetHostViewBase::RendererFrameNumber() {
   return renderer_frame_number_;
 }
 
 void RenderWidgetHostViewBase::DidReceiveRendererFrame() {
   ++renderer_frame_number_;
 }
 
 }  // namespace content