summaryrefslogtreecommitdiffstats
path: root/views/controls/menu
diff options
context:
space:
mode:
Diffstat (limited to 'views/controls/menu')
-rw-r--r--views/controls/menu/menu_controller.cc24
-rw-r--r--views/controls/menu/menu_win.cc4
-rw-r--r--views/controls/menu/native_menu_gtk.cc8
-rw-r--r--views/controls/menu/native_menu_win.cc4
4 files changed, 20 insertions, 20 deletions
diff --git a/views/controls/menu/menu_controller.cc b/views/controls/menu/menu_controller.cc
index 31d21f0..27b059e 100644
--- a/views/controls/menu/menu_controller.cc
+++ b/views/controls/menu/menu_controller.cc
@@ -4,13 +4,13 @@
#include "views/controls/menu/menu_controller.h"
-#include "app/keyboard_codes.h"
#include "app/l10n_util.h"
#include "base/i18n/rtl.h"
#include "base/time.h"
#include "base/utf_string_conversions.h"
#include "gfx/canvas_skia.h"
#include "ui/base/dragdrop/os_exchange_data.h"
+#include "ui/base/keycodes/keyboard_codes.h"
#include "views/controls/button/menu_button.h"
#include "views/controls/menu/menu_scroll_view_container.h"
#include "views/controls/menu/submenu_view.h"
@@ -22,7 +22,7 @@
#include "views/widget/widget.h"
#if defined(OS_LINUX)
-#include "app/keyboard_code_conversion_gtk.h"
+#include "ui/base/keycodes/keyboard_code_conversion_gtk.h"
#endif
#if defined(TOUCH_UI)
@@ -830,8 +830,8 @@ bool MenuController::Dispatch(GdkEvent* event) {
switch (event->type) {
case GDK_KEY_PRESS: {
- app::KeyboardCode win_keycode =
- app::WindowsKeyCodeForGdkKeyCode(event->key.keyval);
+ ui::KeyboardCode win_keycode =
+ ui::WindowsKeyCodeForGdkKeyCode(event->key.keyval);
if (!OnKeyDown(win_keycode))
return false;
@@ -883,35 +883,35 @@ bool MenuController::OnKeyDown(int key_code
DCHECK(blocking_run_);
switch (key_code) {
- case app::VKEY_UP:
+ case ui::VKEY_UP:
IncrementSelection(-1);
break;
- case app::VKEY_DOWN:
+ case ui::VKEY_DOWN:
IncrementSelection(1);
break;
// Handling of VK_RIGHT and VK_LEFT is different depending on the UI
// layout.
- case app::VKEY_RIGHT:
+ case ui::VKEY_RIGHT:
if (base::i18n::IsRTL())
CloseSubmenu();
else
OpenSubmenuChangeSelectionIfCan();
break;
- case app::VKEY_LEFT:
+ case ui::VKEY_LEFT:
if (base::i18n::IsRTL())
OpenSubmenuChangeSelectionIfCan();
else
CloseSubmenu();
break;
- case app::VKEY_SPACE:
+ case ui::VKEY_SPACE:
SendAcceleratorToHotTrackedView();
break;
- case app::VKEY_RETURN:
+ case ui::VKEY_RETURN:
if (pending_state_.item) {
if (pending_state_.item->HasSubmenu()) {
OpenSubmenuChangeSelectionIfCan();
@@ -923,7 +923,7 @@ bool MenuController::OnKeyDown(int key_code
}
break;
- case app::VKEY_ESCAPE:
+ case ui::VKEY_ESCAPE:
if (!state_.item->GetParentMenuItem() ||
(!state_.item->GetParentMenuItem()->GetParentMenuItem() &&
(!state_.item->HasSubmenu() ||
@@ -978,7 +978,7 @@ bool MenuController::SendAcceleratorToHotTrackedView() {
if (!hot_view)
return false;
- Accelerator accelerator(app::VKEY_RETURN, false, false, false);
+ Accelerator accelerator(ui::VKEY_RETURN, false, false, false);
hot_view->AcceleratorPressed(accelerator);
hot_view->SetHotTracked(true);
return true;
diff --git a/views/controls/menu/menu_win.cc b/views/controls/menu/menu_win.cc
index b2ade18..6776a8b 100644
--- a/views/controls/menu/menu_win.cc
+++ b/views/controls/menu/menu_win.cc
@@ -6,7 +6,6 @@
#include <string>
-#include "app/keyboard_codes.h"
#include "app/l10n_util.h"
#include "app/l10n_util_win.h"
#include "app/win/window_impl.h"
@@ -16,6 +15,7 @@
#include "gfx/canvas_skia.h"
#include "gfx/font.h"
#include "gfx/rect.h"
+#include "ui/base/keycodes/keyboard_codes.h"
#include "views/accelerator.h"
namespace views {
@@ -443,7 +443,7 @@ void MenuWin::AddMenuItemInternal(int index,
delegate()->GetLabel(item_id) : label);
// Find out if there is a shortcut we need to append to the label.
- views::Accelerator accelerator(app::VKEY_UNKNOWN, false, false, false);
+ views::Accelerator accelerator(ui::VKEY_UNKNOWN, false, false, false);
if (delegate() && delegate()->GetAcceleratorInfo(item_id, &accelerator)) {
actual_label += L'\t';
actual_label += accelerator.GetShortcutText();
diff --git a/views/controls/menu/native_menu_gtk.cc b/views/controls/menu/native_menu_gtk.cc
index 3aa6c3e..3aecff8 100644
--- a/views/controls/menu/native_menu_gtk.cc
+++ b/views/controls/menu/native_menu_gtk.cc
@@ -8,8 +8,6 @@
#include <map>
#include <string>
-#include "app/keyboard_code_conversion_gtk.h"
-#include "app/keyboard_codes.h"
#include "app/menus/menu_model.h"
#include "base/i18n/rtl.h"
#include "base/message_loop.h"
@@ -18,6 +16,8 @@
#include "gfx/font.h"
#include "gfx/gtk_util.h"
#include "third_party/skia/include/core/SkBitmap.h"
+#include "ui/base/keycodes/keyboard_codes.h"
+#include "ui/base/keycodes/keyboard_code_conversion_gtk.h"
#include "views/accelerator.h"
#include "views/controls/menu/menu_2.h"
#include "views/controls/menu/nested_dispatcher_gtk.h"
@@ -388,7 +388,7 @@ GtkWidget* NativeMenuGtk::AddMenuItemAt(int index,
submenu->GetNativeMenu());
}
- views::Accelerator accelerator(app::VKEY_UNKNOWN, false, false, false);
+ views::Accelerator accelerator(ui::VKEY_UNKNOWN, false, false, false);
if (accel_group && model_->GetAcceleratorAt(index, &accelerator)) {
int gdk_modifiers = 0;
if (accelerator.IsShiftDown())
@@ -398,7 +398,7 @@ GtkWidget* NativeMenuGtk::AddMenuItemAt(int index,
if (accelerator.IsAltDown())
gdk_modifiers |= GDK_MOD1_MASK;
gtk_widget_add_accelerator(menu_item, "activate", accel_group,
- app::GdkKeyCodeForWindowsKeyCode(accelerator.GetKeyCode(), false),
+ ui::GdkKeyCodeForWindowsKeyCode(accelerator.GetKeyCode(), false),
static_cast<GdkModifierType>(gdk_modifiers), GTK_ACCEL_VISIBLE);
}
diff --git a/views/controls/menu/native_menu_win.cc b/views/controls/menu/native_menu_win.cc
index cf36c8e..efdaa67 100644
--- a/views/controls/menu/native_menu_win.cc
+++ b/views/controls/menu/native_menu_win.cc
@@ -4,7 +4,6 @@
#include "views/controls/menu/native_menu_win.h"
-#include "app/keyboard_codes.h"
#include "app/l10n_util.h"
#include "app/l10n_util_win.h"
#include "app/win/hwnd_util.h"
@@ -13,6 +12,7 @@
#include "gfx/canvas_skia.h"
#include "gfx/font.h"
#include "third_party/skia/include/core/SkBitmap.h"
+#include "ui/base/keycodes/keyboard_codes.h"
#include "views/accelerator.h"
#include "views/controls/menu/menu_2.h"
@@ -554,7 +554,7 @@ void NativeMenuWin::UpdateMenuItemInfoForString(
menus::MenuModel::ItemType type = model_->GetTypeAt(model_index);
if (type != menus::MenuModel::TYPE_SUBMENU) {
// Add accelerator details to the label if provided.
- views::Accelerator accelerator(app::VKEY_UNKNOWN, false, false, false);
+ views::Accelerator accelerator(ui::VKEY_UNKNOWN, false, false, false);
if (model_->GetAcceleratorAt(model_index, &accelerator)) {
formatted += L"\t";
formatted += accelerator.GetShortcutText();
generated by cgit v1.1 at 2025-02-12 05:01:57 +0000