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

content/shell/browser/shell_win.cc

 // Copyright 2013 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/shell/browser/shell.h"
 
 #include <windows.h>
 #include <commctrl.h>
 #include <fcntl.h>
 #include <io.h>
 
 #include "base/strings/utf_string_conversions.h"
 #include "base/win/wrapped_window_proc.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_view.h"
 #include "content/shell/app/resource.h"
-#include "ui/base/win/hwnd_util.h"
+#include "ui/gfx/win/hwnd_util.h"
 
 namespace {
 
 const wchar_t kWindowTitle[] = L"Content Shell";
 const wchar_t kWindowClass[] = L"CONTENT_SHELL";
 
 const int kButtonWidth = 72;
 const int kURLBarHeight = 24;
 
 const int kMaxURLLength = 1024;
@@ skipping 17 matching lines @@
 void Shell::PlatformExit() {
   std::vector<Shell*> windows = windows_;
   for (std::vector<Shell*>::iterator it = windows.begin();
        it != windows.end(); ++it)
     DestroyWindow((*it)->window_);
 }
 
 void Shell::PlatformCleanUp() {
   // When the window is destroyed, tell the Edit field to forget about us,
   // otherwise we will crash.
-  ui::SetWindowProc(url_edit_view_, default_edit_wnd_proc_);
-  ui::SetWindowUserData(url_edit_view_, NULL);
+  gfx::SetWindowProc(url_edit_view_, default_edit_wnd_proc_);
+  gfx::SetWindowUserData(url_edit_view_, NULL);
 }
 
 void Shell::PlatformEnableUIControl(UIControl control, bool is_enabled) {
   int id;
   switch (control) {
     case BACK_BUTTON:
       id = IDC_NAV_BACK;
       break;
     case FORWARD_BUTTON:
       id = IDC_NAV_FORWARD;
@@ skipping 15 matching lines @@
 }
 
 void Shell::PlatformSetIsLoading(bool loading) {
 }
 
 void Shell::PlatformCreateWindow(int width, int height) {
   window_ = CreateWindow(kWindowClass, kWindowTitle,
                          WS_OVERLAPPEDWINDOW | WS_CLIPCHILDREN,
                          CW_USEDEFAULT, 0, CW_USEDEFAULT, 0,
                          NULL, NULL, instance_handle_, NULL);
-  ui::SetWindowUserData(window_, this);
+  gfx::SetWindowUserData(window_, this);
 
   HWND hwnd;
   int x = 0;
 
   hwnd = CreateWindow(L"BUTTON", L"Back",
                       WS_CHILD | WS_VISIBLE | BS_PUSHBUTTON ,
                       x, 0, kButtonWidth, kURLBarHeight,
                       window_, (HMENU) IDC_NAV_BACK, instance_handle_, 0);
   x += kButtonWidth;
 
@@ skipping 14 matching lines @@
                       x, 0, kButtonWidth, kURLBarHeight,
                       window_, (HMENU) IDC_NAV_STOP, instance_handle_, 0);
   x += kButtonWidth;
 
   // This control is positioned by PlatformResizeSubViews.
   url_edit_view_ = CreateWindow(L"EDIT", 0,
                                 WS_CHILD | WS_VISIBLE | WS_BORDER | ES_LEFT |
                                 ES_AUTOVSCROLL | ES_AUTOHSCROLL,
                                 x, 0, 0, 0, window_, 0, instance_handle_, 0);
 
-  default_edit_wnd_proc_ = ui::SetWindowProc(url_edit_view_,
+  default_edit_wnd_proc_ = gfx::SetWindowProc(url_edit_view_,
                                              Shell::EditWndProc);
-  ui::SetWindowUserData(url_edit_view_, this);
+  gfx::SetWindowUserData(url_edit_view_, this);
 
   ShowWindow(window_, SW_SHOW);
 
   SizeTo(width, height);
 }
 
 void Shell::PlatformSetContents() {
   SetParent(web_contents_->GetView()->GetNativeView(), window_);
 }
 
@@ skipping 45 matching lines @@
       MAKEINTRESOURCE(IDC_CONTENTSHELL),
       NULL,
       NULL,
       &window_class);
   instance_handle_ = window_class.hInstance;
   return RegisterClassEx(&window_class);
 }
 
 LRESULT CALLBACK Shell::WndProc(HWND hwnd, UINT message, WPARAM wParam,
                                 LPARAM lParam) {
-  Shell* shell = static_cast<Shell*>(ui::GetWindowUserData(hwnd));
+  Shell* shell = static_cast<Shell*>(gfx::GetWindowUserData(hwnd));
 
   switch (message) {
     case WM_COMMAND: {
       int id = LOWORD(wParam);
       switch (id) {
         case IDM_NEW_WINDOW:
           CreateNewWindow(
               shell->web_contents()->GetBrowserContext(),
               GURL(), NULL, MSG_ROUTING_NONE, gfx::Size());
           break;
@@ skipping 41 matching lines @@
       }
       break;
    }
   }
 
   return DefWindowProc(hwnd, message, wParam, lParam);
 }
 
 LRESULT CALLBACK Shell::EditWndProc(HWND hwnd, UINT message,
                                     WPARAM wParam, LPARAM lParam) {
-  Shell* shell = static_cast<Shell*>(ui::GetWindowUserData(hwnd));
+  Shell* shell = static_cast<Shell*>(gfx::GetWindowUserData(hwnd));
 
   switch (message) {
     case WM_CHAR:
       if (wParam == VK_RETURN) {
         wchar_t str[kMaxURLLength + 1];  // Leave room for adding a NULL;
         *(str) = kMaxURLLength;
         LRESULT str_len = SendMessage(hwnd, EM_GETLINE, 0, (LPARAM)str);
         if (str_len > 0) {
           str[str_len] = 0;  // EM_GETLINE doesn't NULL terminate.
           GURL url(str);
           if (!url.has_scheme())
             url = GURL(std::wstring(L"http://") + std::wstring(str));
           shell->LoadURL(url);
         }
 
         return 0;
       }
   }
 
   return CallWindowProc(shell->default_edit_wnd_proc_, hwnd, message, wParam,
                         lParam);
 }
 
 void Shell::PlatformSetTitle(const string16& text) {
   ::SetWindowText(window_, text.c_str());
 }
 
 }  // namespace content