Use base::WindowImpl instead of CWindowImpl to remove a dependency on ATL....

views/controls/menu/menu_win.cc

 // Copyright (c) 2006-2008 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 "views/controls/menu/menu_win.h"
 
-#include <atlbase.h>
-#include <atlapp.h>
-#include <atlwin.h>
-#include <atlcrack.h>
-#include <atlframe.h>
-#include <atlmisc.h>
 #include <string>
 
 #include "app/gfx/canvas.h"
 #include "app/gfx/font.h"
 #include "app/l10n_util.h"
 #include "app/l10n_util_win.h"
 #include "base/gfx/rect.h"
 #include "base/logging.h"
 #include "base/stl_util-inl.h"
 #include "base/string_util.h"
+#include "base/window_impl.h"
 #include "views/accelerator.h"
 
 namespace views {
 
 // The width of an icon, including the pixels between the icon and
 // the item label.
 static const int kIconWidth = 23;
 // Margins between the top of the item and the label.
 static const int kItemTopMargin = 3;
 // Margins between the bottom of the item and the label.
@@ skipping 11 matching lines @@
 // The data of menu items needed to display.
 struct MenuWin::ItemData {
   std::wstring label;
   SkBitmap icon;
   bool submenu;
 };
 
 namespace {
 
 static int ChromeGetMenuItemID(HMENU hMenu, int pos) {
-  // The built-in Windows ::GetMenuItemID doesn't work for submenus,
+  // The built-in Windows GetMenuItemID doesn't work for submenus,
   // so here's our own implementation.
   MENUITEMINFO mii = {0};
   mii.cbSize = sizeof(mii);
   mii.fMask = MIIM_ID;
   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 CWindowImpl<MenuHostWindow, CWindow,
-                                          CWinTraits<WS_CHILD>> {
+class MenuHostWindow : public base::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();
-    Create(parent_window, gfx::Rect().ToRECT(), 0, 0, extended_style);
+    set_window_style(WS_CHILD);
+    set_window_ex_style(extended_style);
+    Init(parent_window, gfx::Rect());
   }
 
   ~MenuHostWindow() {
-    DestroyWindow();
+    DestroyWindow(hwnd());
   }
 
-  DECLARE_FRAME_WND_CLASS(L"MenuHostWindow", NULL);
-  BEGIN_MSG_MAP(MenuHostWindow);
+  BEGIN_MSG_MAP_EX(MenuHostWindow);
     MSG_WM_RBUTTONUP(OnRButtonUp)
     MSG_WM_MEASUREITEM(OnMeasureItem)
     MSG_WM_DRAWITEM(OnDrawItem)
   END_MSG_MAP();
 
  private:
   // NOTE: I really REALLY tried to use WM_MENURBUTTONUP, but I ran into
   // two problems in using it:
   // 1. It doesn't contain the coordinates of the mouse.
   // 2. It isn't invoked for menuitems representing a submenu that have children
@@ skipping 262 matching lines @@
   is_menu_visible_ = true;
   DCHECK(owner_);
   // In order for context menus on menus to work, the context menu needs to
   // share the same window as the first menu is parented to.
   bool created_host = false;
   if (!active_host_window) {
     created_host = true;
     active_host_window = new MenuHostWindow(this, owner_);
   }
   UINT selected_id =
-      TrackPopupMenuEx(menu_, flags, x, y, active_host_window->m_hWnd, NULL);
+      TrackPopupMenuEx(menu_, flags, x, y, active_host_window->hwnd(), NULL);
   if (created_host) {
     delete active_host_window;
     active_host_window = NULL;
   }
   is_menu_visible_ = false;
 
   // Execute the chosen command
   if (selected_id != 0)
     delegate()->ExecuteCommand(selected_id);
 }
@@ skipping 188 matching lines @@
       break;
 
     default:
       NOTREACHED();
       return 0;
   }
   return align_flags;
 }
 
 }  // namespace views