| Index: views/controls/tree/tree_view.cc
|
| diff --git a/views/controls/tree/tree_view.cc b/views/controls/tree/tree_view.cc
|
| index 8657695b0c833474312177d8731338ef478a04ec..6d016c794440ae15bee3e3aee121342511fd01b3 100644
|
| --- a/views/controls/tree/tree_view.cc
|
| +++ b/views/controls/tree/tree_view.cc
|
| @@ -6,10 +6,10 @@
|
|
|
| #include <vector>
|
|
|
| +#include "app/keyboard_codes.h"
|
| #include "app/l10n_util_win.h"
|
| #include "app/resource_bundle.h"
|
| #include "base/i18n/rtl.h"
|
| -#include "base/keyboard_codes.h"
|
| #include "base/stl_util-inl.h"
|
| #include "base/win_util.h"
|
| #include "gfx/canvas_skia.h"
|
| @@ -457,7 +457,7 @@ LRESULT TreeView::OnNotify(int w_param, LPNMHDR l_param) {
|
| return 0;
|
| }
|
|
|
| -bool TreeView::OnKeyDown(base::KeyboardCode virtual_key_code) {
|
| +bool TreeView::OnKeyDown(app::KeyboardCode virtual_key_code) {
|
| if (virtual_key_code == VK_F2) {
|
| if (!GetEditingNode()) {
|
| TreeModelNode* selected_node = GetSelectedNode();
|
| @@ -465,7 +465,7 @@ bool TreeView::OnKeyDown(base::KeyboardCode virtual_key_code) {
|
| StartEditing(selected_node);
|
| }
|
| return true;
|
| - } else if (virtual_key_code == base::VKEY_RETURN && !process_enter_) {
|
| + } else if (virtual_key_code == app::VKEY_RETURN && !process_enter_) {
|
| Widget* widget = GetWidget();
|
| DCHECK(widget);
|
| Accelerator accelerator(Accelerator(virtual_key_code,
|
|
|