Remove even more ATL dependencies.

Review URL: http://codereview.chromium.org/115309

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@16088 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 10 insertions, 8 deletions

diff --git a/webkit/tools/test_shell/foreground_helper.h b/webkit/tools/test_shell/foreground_helper.h
index 3d62b46..458d471 100644
--- a/webkit/tools/test_shell/foreground_helper.h
+++ b/webkit/tools/test_shell/foreground_helper.h
@@ -16,9 +16,9 @@
 // This is probably leveraging a windows bug.
 class ForegroundHelper : public CWindowImpl<ForegroundHelper> {
  public:
-BEGIN_MSG_MAP(ForegroundHelper)
-  MESSAGE_HANDLER(WM_HOTKEY, OnHotKey)
-END_MSG_MAP()
+  BEGIN_MSG_MAP(ForegroundHelper)
+    MESSAGE_HANDLER(WM_HOTKEY, OnHotKey)
+  END_MSG_MAP()
 
   // Brings a window into the foreground.
   // Can be called from any window, even if the caller is not the
@@ -37,7 +37,7 @@ END_MSG_MAP()
     // be in the foreground and allowed to move the target window
     // into the foreground too.
 
-    if(NULL == Create(NULL, NULL, NULL, WS_POPUP))
+    if (NULL == Create(NULL, NULL, NULL, WS_POPUP))
       return AtlHresultFromLastError();
 
     static const int hotkey_id = 0x0000baba;
@@ -62,11 +62,11 @@ END_MSG_MAP()
     // Loop until we get the key.
     // TODO: It may be possible to get stuck here if the
     // message gets lost?
-    while(GetMessage(&msg, NULL, 0, 0)) {
+    while (GetMessage(&msg, NULL, 0, 0)) {
       TranslateMessage(&msg);
       DispatchMessage(&msg);
 
-      if(WM_HOTKEY == msg.message)
+      if (WM_HOTKEY == msg.message)
         break;
     }
 
@@ -77,8 +77,10 @@ END_MSG_MAP()
   }
 
   // Handle the registered Hotkey being pressed.
-  LRESULT OnHotKey(UINT /*uMsg*/, WPARAM /*wParam*/,
-		   LPARAM /*lParam*/, BOOL& bHandled) {
+  LRESULT OnHotKey(UINT message,
+                   WPARAM wparam,
+                   LPARAM lparam,
+                   BOOL& handled) {
     HWND window = reinterpret_cast<HWND>(GetWindowLongPtr(GWLP_USERDATA));
     SetForegroundWindow(window);
     return 1;