diff options
| author | maruel@chromium.org <maruel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-13 17:52:48 +0000 |
|---|---|---|
| committer | maruel@chromium.org <maruel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-13 17:52:48 +0000 |
| commit | 00ffe5dd99527a0cb1035af6749417f5fb1c134e (patch) | |
| tree | 4354d5b35be202204d9392417862b423ba374ce0 /views/controls/tree | |
| parent | 65f73a3a996bdbaa167e38704df092aa39b53d3a (diff) | |
| download | chromium_src-00ffe5dd99527a0cb1035af6749417f5fb1c134e.zip chromium_src-00ffe5dd99527a0cb1035af6749417f5fb1c134e.tar.gz chromium_src-00ffe5dd99527a0cb1035af6749417f5fb1c134e.tar.bz2 | |
Revert 15965. I wasn't supposed to check that in since it still doesn't compile on linux and mac!
TBR=sky
Review URL: http://codereview.chromium.org/113351
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@15967 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, 4 insertions, 9 deletions
diff --git a/views/controls/tree/tree_view.cc b/views/controls/tree/tree_view.cc index d6f6627..894aa6e 100644 --- a/views/controls/tree/tree_view.cc +++ b/views/controls/tree/tree_view.cc @@ -4,9 +4,7 @@ #include "views/controls/tree/tree_view.h" -#include <atlbase.h> -#include <atlapp.h> -#include <atlmisc.h> +#include <shellapi.h> #include "app/gfx/chrome_canvas.h" #include "app/gfx/icon_util.h" @@ -32,7 +30,7 @@ TreeView::TreeView() process_enter_(false), show_context_menu_only_when_node_selected_(true), select_on_right_mouse_down_(true), - ALLOW_THIS_IN_INITIALIZER_LIST(wrapper_(this)), + wrapper_(this), original_handler_(NULL), drag_enabled_(false), has_custom_icons_(false), @@ -483,7 +481,7 @@ bool TreeView::OnKeyDown(int virtual_key_code) { return false; } -void TreeView::OnContextMenu(const WTL::CPoint& location) { +void TreeView::OnContextMenu(const CPoint& location) { if (!GetContextMenuController()) return; diff --git a/views/controls/tree/tree_view.h b/views/controls/tree/tree_view.h index fe470c0..1ded058 100644 --- a/views/controls/tree/tree_view.h +++ b/views/controls/tree/tree_view.h @@ -5,9 +5,6 @@ #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" @@ -162,7 +159,7 @@ class TreeView : public NativeControl, TreeModelObserver { virtual bool NotifyOnKeyDown() const { return true; } virtual bool OnKeyDown(int virtual_key_code); - virtual void OnContextMenu(const WTL::CPoint& location); + virtual void OnContextMenu(const CPoint& location); // Returns the TreeModelNode for |tree_item|. TreeModelNode* GetNodeForTreeItem(HTREEITEM tree_item); |