Use MAKEPOINTS instead of GET_X/Y_LPARAM to reduce a dependency on ATL....

views/controls/tree/tree_view.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/tree/tree_view.h"
 
-#include <atlbase.h>
-#include <atlapp.h>
-#include <atlmisc.h>
+#include <vector>
 
 #include "app/gfx/canvas_paint.h"
 #include "app/gfx/icon_util.h"
 #include "app/l10n_util.h"
 #include "app/l10n_util_win.h"
 #include "app/resource_bundle.h"
+#include "base/gfx/point.h"
 #include "base/stl_util-inl.h"
 #include "base/win_util.h"
 #include "grit/app_resources.h"
 #include "views/focus/focus_manager.h"
 #include "views/widget/widget.h"
 
 namespace views {
 
 TreeView::TreeView()
     : tree_view_(NULL),
@@ skipping 20 matching lines @@
   // as such only need to delete from one.
   STLDeleteContainerPairSecondPointers(id_to_details_map_.begin(),
                                        id_to_details_map_.end());
   if (image_list_)
     ImageList_Destroy(image_list_);
 }
 
 void TreeView::SetModel(TreeModel* model) {
   if (model == model_)
     return;
-  if(model_ && tree_view_)
+  if (model_ && tree_view_)
     DeleteRootItems();
   if (model_)
     model_->SetObserver(NULL);
   model_ = model;
   if (tree_view_ && model_) {
     CreateRootItems();
     model_->SetObserver(this);
     HIMAGELIST last_image_list = image_list_;
     image_list_ = CreateImageList();
     TreeView_SetImageList(tree_view_, image_list_, TVSIL_NORMAL);
@@ skipping 653 matching lines @@
         // over we copy the right bits.
         SetViewportOrgEx(dc, 0, 0, NULL);
       }
       canvas.endPlatformPaint();
       return 0;
     }
 
     case WM_RBUTTONDOWN:
       if (tree->select_on_right_mouse_down_) {
         TVHITTESTINFO hit_info;
-        hit_info.pt.x = GET_X_LPARAM(l_param);
-        hit_info.pt.y = GET_Y_LPARAM(l_param);
+        hit_info.pt = gfx::Point(l_param).ToPOINT();
         HTREEITEM hit_item = TreeView_HitTest(window, &hit_info);
         if (hit_item && (hit_info.flags & (TVHT_ONITEM | TVHT_ONITEMRIGHT |
                                            TVHT_ONITEMINDENT)) != 0)
           TreeView_SelectItem(tree->tree_view_, hit_item);
       }
       // Fall through and let the default handler process as well.
       break;
   }
   WNDPROC handler = tree->original_handler_;
   DCHECK(handler);
   return CallWindowProc(handler, window, message, w_param, l_param);
 }
 
 }  // namespace views