Re-lands 58186:

views/controls/tree/tree_view.h

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef VIEWS_CONTROLS_TREE_TREE_VIEW_H_
 #define VIEWS_CONTROLS_TREE_TREE_VIEW_H_
 #pragma once
 
 #include <windows.h>
 #include <commctrl.h>
 
 #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 {
 
 class TreeView;
 
 // TreeViewController ---------------------------------------------------------
 
 // Controller for the treeview.
 class TreeViewController {
  public:
   // Notification that the selection of the tree view has changed. Use
   // GetSelectedNode to find the current selection.
   virtual void OnTreeViewSelectionChanged(TreeView* tree_view) = 0;
 
   // Returns true if the node can be edited. This is only used if the
   // TreeView is editable.
   virtual bool CanEdit(TreeView* tree_view, TreeModelNode* node) {
     return true;
   }
 
   // Invoked when a key is pressed on the tree view.
-  virtual void OnTreeViewKeyDown(base::KeyboardCode keycode) {}
+  virtual void OnTreeViewKeyDown(app::KeyboardCode keycode) {}
 };
 
 // TreeView -------------------------------------------------------------------
 
 // TreeView displays hierarchical data as returned from a TreeModel. The user
 // can expand, collapse and edit the items. A Controller may be attached to
 // receive notification of selection changes and restrict editing.
 class TreeView : public NativeControl, TreeModelObserver {
  public:
   TreeView();
@@ skipping 124 matching lines @@
   // Creates and configures the tree_view.
   virtual HWND CreateNativeControl(HWND parent_container);
 
   // Invoked when the native control sends a WM_NOTIFY message to its parent.
   // Handles a variety of potential TreeView messages.
   virtual LRESULT OnNotify(int w_param, LPNMHDR l_param);
 
   // 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);
 
   // Returns the TreeModelNode for |tree_item|.
   TreeModelNode* GetNodeForTreeItem(HTREEITEM tree_item);
 
   // Returns the tree item for |node|.
   HTREEITEM GetTreeItemForNode(TreeModelNode* node);
 
  private:
@@ skipping 124 matching lines @@
   bool has_custom_icons_;
 
   HIMAGELIST image_list_;
 
   DISALLOW_COPY_AND_ASSIGN(TreeView);
 };
 
 }  // namespace views
 
 #endif  // VIEWS_CONTROLS_TREE_TREE_VIEW_H_