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

ui/views/controls/menu/menu_win.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/views/controls/menu/menu_win.h"
 
 #include <string>
 
 #include "base/logging.h"
 #include "base/stl_util.h"
 #include "base/strings/string_util.h"
 #include "ui/base/accelerators/accelerator.h"
 #include "ui/base/keycodes/keyboard_codes.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/l10n/l10n_util_win.h"
-#include "ui/base/win/window_impl.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/font.h"
 #include "ui/gfx/rect.h"
+#include "ui/gfx/win/window_impl.h"
 
 namespace views {
 
 // The width of an icon, including the pixels between the icon and
 // the item label.
 const int kIconWidth = 23;
 // Margins between the top of the item and the label.
 const int kItemTopMargin = 3;
 // Margins between the bottom of the item and the label.
 const int kItemBottomMargin = 4;
@@ skipping 25 matching lines @@
   GetMenuItemInfo(hMenu, pos, TRUE, &mii);
   return mii.wID;
 }
 
 // MenuHostWindow -------------------------------------------------------------
 
 // MenuHostWindow is the HWND the HMENU is parented to. MenuHostWindow is used
 // to intercept right clicks on the HMENU and notify the delegate as well as
 // for drawing icons.
 //
-class MenuHostWindow : public ui::WindowImpl {
+class MenuHostWindow : public gfx::WindowImpl {
  public:
   MenuHostWindow(MenuWin* menu, HWND parent_window) : menu_(menu) {
     int extended_style = 0;
     // If the menu needs to be created with a right-to-left UI layout, we must
     // set the appropriate RTL flags (such as WS_EX_LAYOUTRTL) property for the
     // underlying HWND.
     if (menu_->delegate()->IsRightToLeftUILayout())
       extended_style |= l10n_util::GetExtendedStyles();
     set_window_style(WS_CHILD);
     set_window_ex_style(extended_style);
@@ skipping 489 matching lines @@
       break;
 
     default:
       NOTREACHED();
       return 0;
   }
   return align_flags;
 }
 
 }  // namespace views