Re-lands 58186:

views/controls/tree/tree_view.h

Index: views/controls/tree/tree_view.h
diff --git a/views/controls/tree/tree_view.h b/views/controls/tree/tree_view.h
index cbcfbe71a642436f59379af841e87bdf290f4d45..593219cc5d387dba998a9a8c3933f5a27badcc77 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(base::KeyboardCode keycode) {}
+  virtual void OnTreeViewKeyDown(app::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(base::KeyboardCode virtual_key_code);
+  virtual bool OnKeyDown(app::KeyboardCode virtual_key_code);
 
   virtual void OnContextMenu(const POINT& location);