diff options
| author | maruel@chromium.org <maruel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-13 17:31:10 +0000 |
|---|---|---|
| committer | maruel@chromium.org <maruel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-13 17:31:10 +0000 |
| commit | 65f73a3a996bdbaa167e38704df092aa39b53d3a (patch) | |
| tree | f35068757a31bd1efe03996c8a58635dc7edb588 /views/controls/tree | |
| parent | 3c39333a11a67ffe72a8989be898dca8421d573b (diff) | |
| download | chromium_src-65f73a3a996bdbaa167e38704df092aa39b53d3a.zip chromium_src-65f73a3a996bdbaa167e38704df092aa39b53d3a.tar.gz chromium_src-65f73a3a996bdbaa167e38704df092aa39b53d3a.tar.bz2 | |
Remove even more ATL dependencies.
Review URL: http://codereview.chromium.org/115309
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@15965 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/controls/tree')
| -rw-r--r-- | views/controls/tree/tree_view.cc | 8 | ||||
| -rw-r--r-- | views/controls/tree/tree_view.h | 5 |
2 files changed, 9 insertions, 4 deletions
diff --git a/views/controls/tree/tree_view.cc b/views/controls/tree/tree_view.cc index 894aa6e..d6f6627 100644 --- a/views/controls/tree/tree_view.cc +++ b/views/controls/tree/tree_view.cc @@ -4,7 +4,9 @@ #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" @@ -30,7 +32,7 @@ TreeView::TreeView() 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), @@ -481,7 +483,7 @@ bool TreeView::OnKeyDown(int virtual_key_code) { return false; } -void TreeView::OnContextMenu(const CPoint& location) { +void TreeView::OnContextMenu(const WTL::CPoint& location) { if (!GetContextMenuController()) return; diff --git a/views/controls/tree/tree_view.h b/views/controls/tree/tree_view.h index 1ded058..fe470c0 100644 --- a/views/controls/tree/tree_view.h +++ b/views/controls/tree/tree_view.h @@ -5,6 +5,9 @@ #ifndef VIEWS_CONTROLS_TREE_TREE_VIEW_H_ #define VIEWS_CONTROLS_TREE_TREE_VIEW_H_ +#include <windows.h> +#include <commctrl.h> + #include <map> #include "base/basictypes.h" @@ -159,7 +162,7 @@ class TreeView : public NativeControl, TreeModelObserver { virtual bool NotifyOnKeyDown() const { return true; } virtual bool OnKeyDown(int virtual_key_code); - virtual void OnContextMenu(const CPoint& location); + virtual void OnContextMenu(const WTL::CPoint& location); // Returns the TreeModelNode for |tree_item|. TreeModelNode* GetNodeForTreeItem(HTREEITEM tree_item); |