summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--chrome/browser/views/bookmark_manager_view.cc32
-rw-r--r--chrome/browser/views/bookmark_manager_view.h5
-rw-r--r--chrome/browser/views/task_manager_view.cc6
-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
6 files changed, 27 insertions, 23 deletions
diff --git a/chrome/browser/views/bookmark_manager_view.cc b/chrome/browser/views/bookmark_manager_view.cc
index 959e916..fafa228 100644
--- a/chrome/browser/views/bookmark_manager_view.cc
+++ b/chrome/browser/views/bookmark_manager_view.cc
@@ -103,31 +103,31 @@ class ImportObserverImpl : public ImportObserver {
// Converts a virtual keycode into the CutCopyPasteType.
BookmarkManagerView::CutCopyPasteType KeyCodeToCutCopyPaste(
- unsigned short virtual_keycode) {
- switch (virtual_keycode) {
- case VK_INSERT:
+ base::KeyboardCode keycode) {
+ switch (keycode) {
+ case base::VKEY_INSERT:
if (GetKeyState(VK_CONTROL) < 0)
return BookmarkManagerView::COPY;
if (GetKeyState(VK_SHIFT) < 0)
return BookmarkManagerView::PASTE;
return BookmarkManagerView::NONE;
- case VK_DELETE:
+ case base::VKEY_DELETE:
if (GetKeyState(VK_SHIFT) < 0)
return BookmarkManagerView::CUT;
return BookmarkManagerView::NONE;
- case 'C':
+ case base::VKEY_C:
if (GetKeyState(VK_CONTROL) < 0)
return BookmarkManagerView::COPY;
return BookmarkManagerView::NONE;
- case 'V':
+ case base::VKEY_V:
if (GetKeyState(VK_CONTROL) < 0)
return BookmarkManagerView::PASTE;
return BookmarkManagerView::NONE;
- case 'X':
+ case base::VKEY_X:
if (GetKeyState(VK_CONTROL) < 0)
return BookmarkManagerView::CUT;
return BookmarkManagerView::NONE;
@@ -436,9 +436,9 @@ void BookmarkManagerView::OnTableViewDelete(views::TableView* table) {
}
}
-void BookmarkManagerView::OnKeyDown(unsigned short virtual_keycode) {
- switch (virtual_keycode) {
- case VK_RETURN: {
+void BookmarkManagerView::OnKeyDown(base::KeyboardCode keycode) {
+ switch (keycode) {
+ case base::VKEY_RETURN: {
std::vector<const BookmarkNode*> selected_nodes = GetSelectedTableNodes();
if (selected_nodes.size() == 1 && selected_nodes[0]->is_folder()) {
SelectInTree(selected_nodes[0]);
@@ -450,7 +450,7 @@ void BookmarkManagerView::OnKeyDown(unsigned short virtual_keycode) {
break;
}
- case VK_BACK: {
+ case base::VKEY_BACK: {
const BookmarkNode* selected_folder = GetSelectedFolder();
if (selected_folder != NULL &&
selected_folder->GetParent() != GetBookmarkModel()->root_node()) {
@@ -460,7 +460,7 @@ void BookmarkManagerView::OnKeyDown(unsigned short virtual_keycode) {
}
default:
- OnCutCopyPaste(KeyCodeToCutCopyPaste(virtual_keycode), true);
+ OnCutCopyPaste(KeyCodeToCutCopyPaste(keycode), true);
break;
}
}
@@ -503,9 +503,9 @@ void BookmarkManagerView::OnTreeViewSelectionChanged(
SetTableModel(new_table_model, table_parent_node, is_search);
}
-void BookmarkManagerView::OnTreeViewKeyDown(unsigned short virtual_keycode) {
- switch (virtual_keycode) {
- case VK_DELETE: {
+void BookmarkManagerView::OnTreeViewKeyDown(base::KeyboardCode keycode) {
+ switch (keycode) {
+ case base::VKEY_DELETE: {
const BookmarkNode* node = GetSelectedFolder();
if (!node || node->GetParent() == GetBookmarkModel()->root_node())
return;
@@ -516,7 +516,7 @@ void BookmarkManagerView::OnTreeViewKeyDown(unsigned short virtual_keycode) {
}
default:
- OnCutCopyPaste(KeyCodeToCutCopyPaste(virtual_keycode), false);
+ OnCutCopyPaste(KeyCodeToCutCopyPaste(keycode), false);
break;
}
}
diff --git a/chrome/browser/views/bookmark_manager_view.h b/chrome/browser/views/bookmark_manager_view.h
index 608b8c7..37bc746 100644
--- a/chrome/browser/views/bookmark_manager_view.h
+++ b/chrome/browser/views/bookmark_manager_view.h
@@ -5,6 +5,7 @@
#ifndef CHROME_BROWSER_VIEWS_BOOKMARK_MANAGER_VIEW_H_
#define CHROME_BROWSER_VIEWS_BOOKMARK_MANAGER_VIEW_H_
+#include "base/keyboard_codes.h"
#include "base/ref_counted.h"
#include "base/task.h"
#include "chrome/browser/bookmarks/bookmark_model_observer.h"
@@ -112,11 +113,11 @@ class BookmarkManagerView : public views::View,
virtual void OnDoubleClick();
virtual void OnMiddleClick();
virtual void OnTableViewDelete(views::TableView* table);
- virtual void OnKeyDown(unsigned short virtual_keycode);
+ virtual void OnKeyDown(base::KeyboardCode keycode);
// TreeViewController methods.
virtual void OnTreeViewSelectionChanged(views::TreeView* tree_view);
- virtual void OnTreeViewKeyDown(unsigned short virtual_keycode);
+ virtual void OnTreeViewKeyDown(base::KeyboardCode keycode);
#if defined(BROWSER_SYNC)
// views::ButtonListener method.
diff --git a/chrome/browser/views/task_manager_view.cc b/chrome/browser/views/task_manager_view.cc
index 47bb74c..468562e 100644
--- a/chrome/browser/views/task_manager_view.cc
+++ b/chrome/browser/views/task_manager_view.cc
@@ -215,7 +215,7 @@ class TaskManagerView : public views::View,
// views::TableViewObserver implementation.
virtual void OnSelectionChanged();
virtual void OnDoubleClick();
- virtual void OnKeyDown(unsigned short virtual_keycode);
+ virtual void OnKeyDown(base::KeyboardCode keycode);
// views::LinkController implementation.
virtual void LinkActivated(views::Link* source, int event_flags);
@@ -582,8 +582,8 @@ void TaskManagerView::OnDoubleClick() {
ActivateFocusedTab();
}
-void TaskManagerView::OnKeyDown(unsigned short virtual_keycode) {
- if (virtual_keycode == base::VKEY_RETURN)
+void TaskManagerView::OnKeyDown(base::KeyboardCode keycode) {
+ if (keycode == base::VKEY_RETURN)
ActivateFocusedTab();
}
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 -------------------------------------------------------------------
generated by cgit v1.1 at 2025-03-03 17:35:16 +0000