Remove some uses of ATL in UI code

ui/aura/root_window_host_win.h

 // 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.
 
 #ifndef UI_AURA_ROOT_WINDOW_HOST_WIN_H_
 #define UI_AURA_ROOT_WINDOW_HOST_WIN_H_
 
 #include "base/compiler_specific.h"
 #include "ui/aura/aura_export.h"
 #include "ui/aura/window_tree_host.h"
@@ skipping 22 matching lines @@
   virtual bool QueryMouseLocation(gfx::Point* location_return) OVERRIDE;
   virtual bool ConfineCursorToRootWindow() OVERRIDE;
   virtual void UnConfineCursor() OVERRIDE;
   virtual void OnCursorVisibilityChanged(bool show) OVERRIDE;
   virtual void MoveCursorTo(const gfx::Point& location) OVERRIDE;
   virtual void PostNativeEvent(const base::NativeEvent& native_event) OVERRIDE;
   virtual void OnDeviceScaleFactorChanged(float device_scale_factor) OVERRIDE;
   virtual void PrepareForShutdown() OVERRIDE;
 
  private:
-  BEGIN_MSG_MAP_EX(WindowTreeHostWin)
+  CR_BEGIN_MSG_MAP_EX(WindowTreeHostWin)
     // Range handlers must go first!
-    MESSAGE_RANGE_HANDLER_EX(WM_MOUSEFIRST, WM_MOUSELAST, OnMouseRange)
-    MESSAGE_RANGE_HANDLER_EX(WM_NCMOUSEMOVE, WM_NCXBUTTONDBLCLK, OnMouseRange)
+    CR_MESSAGE_RANGE_HANDLER_EX(WM_MOUSEFIRST, WM_MOUSELAST, OnMouseRange)
+    CR_MESSAGE_RANGE_HANDLER_EX(WM_NCMOUSEMOVE,
+                                WM_NCXBUTTONDBLCLK,
+                                OnMouseRange)
 
     // Mouse capture events.
-    MESSAGE_HANDLER_EX(WM_CAPTURECHANGED, OnCaptureChanged)
+    CR_MESSAGE_HANDLER_EX(WM_CAPTURECHANGED, OnCaptureChanged)
 
     // Key events.
-    MESSAGE_HANDLER_EX(WM_KEYDOWN, OnKeyEvent)
-    MESSAGE_HANDLER_EX(WM_KEYUP, OnKeyEvent)
-    MESSAGE_HANDLER_EX(WM_SYSKEYDOWN, OnKeyEvent)
-    MESSAGE_HANDLER_EX(WM_SYSKEYUP, OnKeyEvent)
-    MESSAGE_HANDLER_EX(WM_CHAR, OnKeyEvent)
-    MESSAGE_HANDLER_EX(WM_SYSCHAR, OnKeyEvent)
-    MESSAGE_HANDLER_EX(WM_IME_CHAR, OnKeyEvent)
-    MESSAGE_HANDLER_EX(WM_NCACTIVATE, OnNCActivate)
+    CR_MESSAGE_HANDLER_EX(WM_KEYDOWN, OnKeyEvent)
+    CR_MESSAGE_HANDLER_EX(WM_KEYUP, OnKeyEvent)
+    CR_MESSAGE_HANDLER_EX(WM_SYSKEYDOWN, OnKeyEvent)
+    CR_MESSAGE_HANDLER_EX(WM_SYSKEYUP, OnKeyEvent)
+    CR_MESSAGE_HANDLER_EX(WM_CHAR, OnKeyEvent)
+    CR_MESSAGE_HANDLER_EX(WM_SYSCHAR, OnKeyEvent)
+    CR_MESSAGE_HANDLER_EX(WM_IME_CHAR, OnKeyEvent)
+    CR_MESSAGE_HANDLER_EX(WM_NCACTIVATE, OnNCActivate)
 
-    MSG_WM_CLOSE(OnClose)
-    MSG_WM_MOVE(OnMove)
-    MSG_WM_PAINT(OnPaint)
-    MSG_WM_SIZE(OnSize)
-  END_MSG_MAP()
+    CR_MSG_WM_CLOSE(OnClose)
+    CR_MSG_WM_MOVE(OnMove)
+    CR_MSG_WM_PAINT(OnPaint)
+    CR_MSG_WM_SIZE(OnSize)
+  CR_END_MSG_MAP()
 
   void OnClose();
   LRESULT OnKeyEvent(UINT message, WPARAM w_param, LPARAM l_param);
   LRESULT OnMouseRange(UINT message, WPARAM w_param, LPARAM l_param);
   LRESULT OnCaptureChanged(UINT message, WPARAM w_param, LPARAM l_param);
   LRESULT OnNCActivate(UINT message, WPARAM w_param, LPARAM l_param);
-  void OnMove(const CPoint& point);
+  void OnMove(const gfx::Point& point);
   void OnPaint(HDC dc);
-  void OnSize(UINT param, const CSize& size);
+  void OnSize(UINT param, const gfx::Size& size);
 
   bool fullscreen_;
   bool has_capture_;
   RECT saved_window_rect_;
   DWORD saved_window_style_;
   DWORD saved_window_ex_style_;
 
   DISALLOW_COPY_AND_ASSIGN(WindowTreeHostWin);
 };
 
 namespace test {
 
 // Set true to let WindowTreeHostWin use a popup window
 // with no frame/title so that the window size and test's
 // expectations matches.
 AURA_EXPORT void SetUsePopupAsRootWindowForTest(bool use);
 
 }  // namespace
 
 }  // namespace aura
 
 #endif  // UI_AURA_ROOT_WINDOW_HOST_WIN_H_