Remove some uses of ATL in UI code

mojo/services/native_viewport/native_viewport_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 "mojo/services/native_viewport/native_viewport.h"
 
 #include "ui/events/event.h"
+#include "ui/gfx/win/msg_util.h"
 #include "ui/gfx/win/window_impl.h"
 
 namespace mojo {
 namespace services {
 namespace {
 
 gfx::Rect GetWindowBoundsForClientBounds(DWORD style, DWORD ex_style,
                                          const gfx::Rect& bounds) {
   RECT wr;
   wr.left = bounds.x();
@@ skipping 53 matching lines @@
   virtual void SetCapture() OVERRIDE {
     DCHECK(::GetCapture() != hwnd());
     ::SetCapture(hwnd());
   }
 
   virtual void ReleaseCapture() OVERRIDE {
     if (::GetCapture() == hwnd())
       ::ReleaseCapture();
   }
 
-  BEGIN_MSG_MAP_EX(NativeViewportWin)
-    MESSAGE_RANGE_HANDLER_EX(WM_MOUSEFIRST, WM_MOUSELAST, OnMouseRange)
+  CR_BEGIN_MSG_MAP_EX(NativeViewportWin)
+    CR_MESSAGE_RANGE_HANDLER_EX(WM_MOUSEFIRST, WM_MOUSELAST, OnMouseRange)
 
-    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)
+    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)
 
-    MSG_WM_CREATE(OnCreate)
-    MSG_WM_DESTROY(OnDestroy)
-    MSG_WM_PAINT(OnPaint)
-    MSG_WM_WINDOWPOSCHANGED(OnWindowPosChanged)
-  END_MSG_MAP()
+    CR_MSG_WM_CREATE(OnCreate)
+    CR_MSG_WM_DESTROY(OnDestroy)
+    CR_MSG_WM_PAINT(OnPaint)
+    CR_MSG_WM_WINDOWPOSCHANGED(OnWindowPosChanged)
+  CR_END_MSG_MAP()
 
   LRESULT OnMouseRange(UINT message, WPARAM w_param, LPARAM l_param) {
     MSG msg = { hwnd(), message, w_param, l_param, 0,
-                { GET_X_LPARAM(l_param), GET_Y_LPARAM(l_param) } };
+                { CR_GET_X_LPARAM(l_param), CR_GET_Y_LPARAM(l_param) } };
     ui::MouseEvent event(msg);
     SetMsgHandled(delegate_->OnEvent(&event));
     return 0;
   }
   LRESULT OnKeyEvent(UINT message, WPARAM w_param, LPARAM l_param) {
     MSG msg = { hwnd(), message, w_param, l_param };
     ui::KeyEvent event(msg, message == WM_CHAR);
     SetMsgHandled(delegate_->OnEvent(&event));
     return 0;
   }
@@ skipping 32 matching lines @@
 
 // static
 scoped_ptr<NativeViewport> NativeViewport::Create(
     shell::Context* context,
     NativeViewportDelegate* delegate) {
   return scoped_ptr<NativeViewport>(new NativeViewportWin(delegate)).Pass();
 }
 
 }  // namespace services
 }  // namespace mojo