Remove even more ATL dependencies.

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 <shellapi.h>
+#include <atlbase.h>
+#include <atlapp.h>
+#include <atlmisc.h>
 
 #include "app/gfx/chrome_canvas.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/stl_util-inl.h"
 #include "base/win_util.h"
 #include "grit/theme_resources.h"
 #include "views/focus/focus_manager.h"
 #include "views/widget/widget.h"
 
 namespace views {
 
 TreeView::TreeView()
     : tree_view_(NULL),
       model_(NULL),
       editable_(true),
       next_id_(0),
       controller_(NULL),
       editing_node_(NULL),
       root_shown_(true),
       process_enter_(false),
       show_context_menu_only_when_node_selected_(true),
       select_on_right_mouse_down_(true),
-      wrapper_(this),
+      ALLOW_THIS_IN_INITIALIZER_LIST(wrapper_(this)),
       original_handler_(NULL),
       drag_enabled_(false),
       has_custom_icons_(false),
       image_list_(NULL) {
 }
 
 TreeView::~TreeView() {
   if (model_)
     model_->SetObserver(NULL);
   // Both param_to_details_map_ and node_to_details_map_ have the same value,
@@ skipping 430 matching lines @@
     Accelerator accelerator(Accelerator(static_cast<int>(virtual_key_code),
                                         win_util::IsShiftPressed(),
                                         win_util::IsCtrlPressed(),
                                         win_util::IsAltPressed()));
     fm->ProcessAccelerator(accelerator);
     return true;
   }
   return false;
 }
 
-void TreeView::OnContextMenu(const CPoint& location) {
+void TreeView::OnContextMenu(const WTL::CPoint& location) {
   if (!GetContextMenuController())
     return;
 
   if (location.x == -1 && location.y == -1) {
     // Let NativeControl's implementation handle keyboard gesture.
     NativeControl::OnContextMenu(location);
     return;
   }
 
   if (show_context_menu_only_when_node_selected_) {
@@ skipping 241 matching lines @@
       }
       // 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