Changing the KeyboardEvent to use a KeyboardCode instead of a w_char. Led to several places where I had to switch from VK_ to VKEY_.

Also cleaned-up the table view OnKeyDown method. Since TableView is a NativeControl it can use the NativeControl::OnKeyDown directly.

BUG=None
TEST=Make sure short-cuts works as expected, especially in the omnibox.
Review URL: http://codereview.chromium.org/248010

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@27412 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 6 insertions, 4 deletions

diff --git a/views/controls/tree/tree_view.cc b/views/controls/tree/tree_view.cc
index 196e773..c84ef8b 100644
--- a/views/controls/tree/tree_view.cc
+++ b/views/controls/tree/tree_view.cc
@@ -12,6 +12,7 @@
 #include "app/l10n_util_win.h"
 #include "app/resource_bundle.h"
 #include "base/gfx/point.h"
+#include "base/keyboard_codes.h"
 #include "base/stl_util-inl.h"
 #include "base/win_util.h"
 #include "grit/app_resources.h"
@@ -459,7 +460,7 @@ LRESULT TreeView::OnNotify(int w_param, LPNMHDR l_param) {
   return 0;
 }
 
-bool TreeView::OnKeyDown(int virtual_key_code) {
+bool TreeView::OnKeyDown(base::KeyboardCode virtual_key_code) {
   if (virtual_key_code == VK_F2) {
     if (!GetEditingNode()) {
       TreeModelNode* selected_node = GetSelectedNode();
@@ -467,10 +468,10 @@ bool TreeView::OnKeyDown(int virtual_key_code) {
         StartEditing(selected_node);
     }
     return true;
-  } else if (virtual_key_code == VK_RETURN && !process_enter_) {
+  } else if (virtual_key_code == base::VKEY_RETURN && !process_enter_) {
     Widget* widget = GetWidget();
     DCHECK(widget);
-    Accelerator accelerator(Accelerator(static_cast<int>(virtual_key_code),
+    Accelerator accelerator(Accelerator(virtual_key_code,
                                         win_util::IsShiftPressed(),
                                         win_util::IsCtrlPressed(),
                                         win_util::IsAltPressed()));
diff --git a/views/controls/tree/tree_view.h b/views/controls/tree/tree_view.h
index 72667bf..0011835 100644
--- a/views/controls/tree/tree_view.h
+++ b/views/controls/tree/tree_view.h
@@ -12,6 +12,7 @@
 
 #include "app/tree_model.h"
 #include "base/basictypes.h"
+#include "base/keyboard_codes.h"
 #include "base/logging.h"
 #include "views/controls/native_control.h"
 
@@ -159,7 +160,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(int virtual_key_code);
+  virtual bool OnKeyDown(base::KeyboardCode virtual_key_code);
 
   virtual void OnContextMenu(const POINT& location);