summaryrefslogtreecommitdiffstats
path: root/views
diff options
context:
space:
mode:
authorjcampan@chromium.org <jcampan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-23 01:02:38 +0000
committerjcampan@chromium.org <jcampan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-23 01:02:38 +0000
commitf554832167558b7f4810883b59aeb73b8f79114f (patch)
tree002509ec0af088e08588bb2eb6e4ee8274beed77 /views
parent905ec55d6d282074a5b927c10404c864ed3f144a (diff)
downloadchromium_src-f554832167558b7f4810883b59aeb73b8f79114f.zip
chromium_src-f554832167558b7f4810883b59aeb73b8f79114f.tar.gz
chromium_src-f554832167558b7f4810883b59aeb73b8f79114f.tar.bz2
The TableViewObserver::OnKeyDown method signature was changed recently and
the bookmark manager view had not been properly updated and was not called anymore, breaking the keyboard shortcuts. This was broken in the TaskManager as well. Also changed the TreeView to use the base::KeyboardCode. BUG=25533 TEST=Test that the different shortcuts (CTRL-X,CTRL-V, CTRL-C, DELETE, ENTER...) work in the bookmark manager. Test that in the TaskManager, pressing ENTER activates the selected tab. Review URL: http://codereview.chromium.org/322006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@29854 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views')
-rw-r--r--views/controls/table/table_view_observer.h2
-rw-r--r--views/controls/tree/tree_view.cc3
-rw-r--r--views/controls/tree/tree_view.h2
3 files changed, 5 insertions, 2 deletions
diff --git a/views/controls/table/table_view_observer.h b/views/controls/table/table_view_observer.h
index 6b8bef2..f4cacbf 100644
--- a/views/controls/table/table_view_observer.h
+++ b/views/controls/table/table_view_observer.h
@@ -5,6 +5,8 @@
#ifndef VIEWS_CONTROLS_TABLE_TABLE_VIEW_OBSERVER_H_
#define VIEWS_CONTROLS_TABLE_TABLE_VIEW_OBSERVER_H_
+#include "base/keyboard_codes.h"
+
namespace views {
class TableView;
diff --git a/views/controls/tree/tree_view.cc b/views/controls/tree/tree_view.cc
index c84ef8b..db2c315 100644
--- a/views/controls/tree/tree_view.cc
+++ b/views/controls/tree/tree_view.cc
@@ -450,7 +450,8 @@ LRESULT TreeView::OnNotify(int w_param, LPNMHDR l_param) {
if (controller_) {
NMTVKEYDOWN* key_down_message =
reinterpret_cast<NMTVKEYDOWN*>(l_param);
- controller_->OnTreeViewKeyDown(key_down_message->wVKey);
+ controller_->OnTreeViewKeyDown(
+ win_util::WinToKeyboardCode(key_down_message->wVKey));
}
break;
diff --git a/views/controls/tree/tree_view.h b/views/controls/tree/tree_view.h
index 0011835..c81452c 100644
--- a/views/controls/tree/tree_view.h
+++ b/views/controls/tree/tree_view.h
@@ -36,7 +36,7 @@ class TreeViewController {
}
// Invoked when a key is pressed on the tree view.
- virtual void OnTreeViewKeyDown(unsigned short virtual_keycode) {}
+ virtual void OnTreeViewKeyDown(base::KeyboardCode keycode) {}
};
// TreeView -------------------------------------------------------------------