summaryrefslogtreecommitdiffstats
path: root/views/controls/tree/tree_view.h
diff options
context:
space:
mode:
authorakalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-09-02 19:54:58 +0000
committerakalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-09-02 19:54:58 +0000
commit0cc3dfe387313821853e658a6e2fb3b729eac9e5 (patch)
tree6bdf4d23c62ae78cafc6e7c5a2599cce70dfef22 /views/controls/tree/tree_view.h
parent3c70591cc7d0d8cc162c10f7d3ac3b2ac15e4e69 (diff)
downloadchromium_src-0cc3dfe387313821853e658a6e2fb3b729eac9e5.zip
chromium_src-0cc3dfe387313821853e658a6e2fb3b729eac9e5.tar.gz
chromium_src-0cc3dfe387313821853e658a6e2fb3b729eac9e5.tar.bz2
Revert 58388 - Revert 58215 - Revert 58186 - Move the keyboard files from base/ to app/.
Also moves the associated classes/enums from base:: to app::. TEST=try bots compile BUG=NONE Review URL: http://codereview.chromium.org/3165064 TBR=bryeung@chromium.org TBR=phajdan.jr@chromium.org Review URL: http://codereview.chromium.org/3361003 TBR=bryeung@chromium.org Review URL: http://codereview.chromium.org/3337006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@58390 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/controls/tree/tree_view.h')
-rw-r--r--views/controls/tree/tree_view.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/views/controls/tree/tree_view.h b/views/controls/tree/tree_view.h
index 593219c..cbcfbe7 100644
--- a/views/controls/tree/tree_view.h
+++ b/views/controls/tree/tree_view.h
@@ -11,9 +11,9 @@
#include <map>
-#include "app/keyboard_codes.h"
#include "app/tree_model.h"
#include "base/basictypes.h"
+#include "base/keyboard_codes.h"
#include "views/controls/native_control.h"
namespace views {
@@ -36,7 +36,7 @@ class TreeViewController {
}
// Invoked when a key is pressed on the tree view.
- virtual void OnTreeViewKeyDown(app::KeyboardCode keycode) {}
+ virtual void OnTreeViewKeyDown(base::KeyboardCode keycode) {}
};
// TreeView -------------------------------------------------------------------
@@ -181,7 +181,7 @@ class TreeView : public NativeControl, TreeModelObserver {
// We pay attention to key down for two reasons: to circumvent VK_ENTER from
// toggling the expaned state when processes_enter_ is false, and to have F2
// start editting.
- virtual bool OnKeyDown(app::KeyboardCode virtual_key_code);
+ virtual bool OnKeyDown(base::KeyboardCode virtual_key_code);
virtual void OnContextMenu(const POINT& location);