Move SimpleMenuModel out of ui/base

This is a precursor CL to allow SimpleMenuModel to include actions.h, in order to be able to create menu items from action items.
Currently, simple_menu_model cannot include actions, as doing so creates a dependency cycle from ui/base -> ui/actions -> ui/base.

Many of the changes here are simply renaming include paths from ui/base/models -> ui/menus/models. The only significant changes here that need to be reviewed are changes in BUILD.gn and DEPS files.

Change-Id: I345efc6c42bbf2d7fdd539c0b312a8f5db338382
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5892572
Reviewed-by: Nico Weber <thakis@chromium.org>
Reviewed-by: Achuith Bhandarkar <achuith@chromium.org>
Commit-Queue: Joseph Park <josephjoopark@chromium.org>
Reviewed-by: Emilia Paz <emiliapaz@chromium.org>
Reviewed-by: Avi Drissman <avi@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1370692}

ash/app_list/app_list_test_view_delegate.h

@@ -22,8 +22,8 @@
 #include "ash/public/cpp/app_list/app_list_types.h"
 #include "base/functional/callback_forward.h"
 #include "chromeos/ash/services/assistant/public/cpp/assistant_enums.h"
-#include "ui/base/models/simple_menu_model.h"
 #include "ui/base/mojom/menu_source_type.mojom-forward.h"
+#include "ui/menus/simple_menu_model.h"
 
 namespace ash {
 namespace test {

ash/app_list/model/app_list_test_model.cc

@@ -18,10 +18,10 @@
 #include "base/strings/utf_string_conversions.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/base/models/menu_model.h"
-#include "ui/base/models/simple_menu_model.h"
 #include "ui/gfx/image/image_skia.h"
 #include "ui/gfx/image/image_skia_operations.h"
 #include "ui/gfx/image/image_unittest_util.h"
+#include "ui/menus/simple_menu_model.h"
 
 namespace ash {
 namespace test {

ash/app_list/test_app_list_client.cc

@@ -13,7 +13,7 @@
 #include "base/functional/bind.h"
 #include "base/task/sequenced_task_runner.h"
 #include "base/time/time.h"
-#include "ui/base/models/simple_menu_model.h"
+#include "ui/menus/simple_menu_model.h"
 
 namespace ash {
 

ash/app_list/views/app_list_menu_model_adapter.h

@@ -13,9 +13,9 @@
 #include "ash/app_menu/app_menu_model_adapter.h"
 #include "ash/ash_export.h"
 #include "ash/public/cpp/app_list/app_list_types.h"
-#include "ui/base/models/simple_menu_model.h"
 #include "ui/base/mojom/menu_source_type.mojom-forward.h"
 #include "ui/base/ui_base_types.h"
+#include "ui/menus/simple_menu_model.h"
 
 namespace ash {
 

ash/app_list/views/apps_grid_context_menu.cc

@@ -15,8 +15,8 @@
 #include "ash/resources/vector_icons/vector_icons.h"
 #include "ash/strings/grit/ash_strings.h"
 #include "ui/base/l10n/l10n_util.h"
-#include "ui/base/models/simple_menu_model.h"
 #include "ui/base/mojom/menu_source_type.mojom.h"
+#include "ui/menus/simple_menu_model.h"
 #include "ui/views/controls/menu/menu_item_view.h"
 #include "ui/views/controls/menu/menu_model_adapter.h"
 #include "ui/views/controls/menu/menu_runner.h"

ash/app_list/views/apps_grid_context_menu.h

@@ -9,8 +9,8 @@
 
 #include "ash/ash_export.h"
 #include "base/memory/raw_ptr.h"
-#include "ui/base/models/simple_menu_model.h"
 #include "ui/base/mojom/menu_source_type.mojom-forward.h"
+#include "ui/menus/simple_menu_model.h"
 #include "ui/views/context_menu_controller.h"
 
 namespace views {

ash/app_list/views/continue_task_view.cc

@@ -29,12 +29,12 @@
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/metadata/metadata_impl_macros.h"
 #include "ui/base/models/menu_separator_types.h"
-#include "ui/base/models/simple_menu_model.h"
 #include "ui/base/mojom/menu_source_type.mojom-forward.h"
 #include "ui/chromeos/styles/cros_tokens_color_mappings.h"
 #include "ui/color/color_id.h"
 #include "ui/compositor/layer.h"
 #include "ui/gfx/image/image_skia_operations.h"
+#include "ui/menus/simple_menu_model.h"
 #include "ui/views/accessibility/view_accessibility.h"
 #include "ui/views/animation/ink_drop.h"
 #include "ui/views/background.h"

ash/app_list/views/continue_task_view.h

@@ -11,8 +11,8 @@
 #include "ash/app_list/model/search/search_result_observer.h"
 #include "ash/ash_export.h"
 #include "base/memory/raw_ptr.h"
-#include "ui/base/models/simple_menu_model.h"
 #include "ui/base/mojom/menu_source_type.mojom-forward.h"
+#include "ui/menus/simple_menu_model.h"
 #include "ui/views/context_menu_controller.h"
 #include "ui/views/controls/button/button.h"
 

ash/app_list/views/search_box_view.cc

@@ -64,7 +64,6 @@
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/metadata/metadata_header_macros.h"
 #include "ui/base/metadata/metadata_impl_macros.h"
-#include "ui/base/models/simple_menu_model.h"
 #include "ui/base/mojom/menu_source_type.mojom.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/chromeos/styles/cros_tokens_color_mappings.h"
@@ -78,6 +77,7 @@
 #include "ui/gfx/geometry/insets.h"
 #include "ui/gfx/geometry/rounded_corners_f.h"
 #include "ui/gfx/paint_vector_icon.h"
+#include "ui/menus/simple_menu_model.h"
 #include "ui/views/accessibility/view_accessibility.h"
 #include "ui/views/animation/ink_drop.h"
 #include "ui/views/animation/ink_drop_host.h"

ash/app_list/views/search_result_image_view_delegate.cc

@@ -9,7 +9,7 @@
 #include "ash/app_list/model/search/search_result.h"
 #include "ash/app_list/views/search_result_image_view.h"
 #include "ui/base/dragdrop/drag_drop_types.h"
-#include "ui/base/models/simple_menu_model.h"
+#include "ui/menus/simple_menu_model.h"
 #include "ui/views/controls/menu/menu_runner.h"
 #include "ui/views/view_utils.h"
 

ash/app_list/views/search_result_image_view_delegate.h

@@ -6,7 +6,7 @@
 #define ASH_APP_LIST_VIEWS_SEARCH_RESULT_IMAGE_VIEW_DELEGATE_H_
 
 #include "ash/ash_export.h"
-#include "ui/base/models/simple_menu_model.h"
+#include "ui/menus/simple_menu_model.h"
 #include "ui/views/context_menu_controller.h"
 #include "ui/views/drag_controller.h"
 

ash/app_menu/app_menu_model_adapter.cc

@@ -12,8 +12,8 @@
 #include "ash/public/cpp/app_menu_constants.h"
 #include "base/metrics/histogram_functions.h"
 #include "ui/accessibility/ax_enums.mojom.h"
-#include "ui/base/models/simple_menu_model.h"
 #include "ui/base/mojom/menu_source_type.mojom-forward.h"
+#include "ui/menus/simple_menu_model.h"
 #include "ui/views/controls/menu/menu_item_view.h"
 #include "ui/views/controls/menu/menu_model_adapter.h"
 #include "ui/views/controls/menu/menu_runner.h"

ash/app_menu/app_menu_model_adapter_unittest.cc

@@ -9,8 +9,8 @@
 #include "ash/public/cpp/app_menu_constants.h"
 #include "ash/test/ash_test_base.h"
 #include "testing/gtest/include/gtest/gtest.h"
-#include "ui/base/models/simple_menu_model.h"
 #include "ui/base/mojom/menu_source_type.mojom.h"
+#include "ui/menus/simple_menu_model.h"
 #include "ui/views/controls/menu/menu_item_view.h"
 #include "ui/views/test/menu_test_utils.h"
 

ash/app_menu/notification_menu_controller.cc

@@ -7,7 +7,7 @@
 #include "ash/app_menu/app_menu_model_adapter.h"
 #include "ash/app_menu/notification_menu_view.h"
 #include "ash/public/cpp/app_menu_constants.h"
-#include "ui/base/models/simple_menu_model.h"
+#include "ui/menus/simple_menu_model.h"
 #include "ui/views/controls/menu/menu_item_view.h"
 #include "ui/views/controls/menu/submenu_view.h"
 

ash/app_menu/notification_menu_controller_unittest.cc

@@ -10,8 +10,8 @@
 #include "base/memory/raw_ptr.h"
 #include "base/strings/utf_string_conversions.h"
 #include "testing/gtest/include/gtest/gtest.h"
-#include "ui/base/models/simple_menu_model.h"
 #include "ui/base/mojom/menu_source_type.mojom.h"
+#include "ui/menus/simple_menu_model.h"
 #include "ui/views/controls/menu/menu_item_view.h"
 #include "ui/views/controls/menu/submenu_view.h"
 

ash/clipboard/clipboard_history_controller_impl.cc

@@ -65,7 +65,6 @@
 #include "ui/base/ime/input_method.h"
 #include "ui/base/ime/text_input_client.h"
 #include "ui/base/models/image_model.h"
-#include "ui/base/models/simple_menu_model.h"
 #include "ui/base/mojom/menu_source_type.mojom.h"
 #include "ui/base/webui/web_ui_util.h"
 #include "ui/color/color_provider_source.h"
@@ -74,6 +73,7 @@
 #include "ui/events/keycodes/keyboard_codes_posix.h"
 #include "ui/events/types/event_type.h"
 #include "ui/gfx/geometry/rect.h"
+#include "ui/menus/simple_menu_model.h"
 #include "ui/views/controls/menu/menu_controller.h"
 
 #if BUILDFLAG(USE_XKBCOMMON)

ash/clipboard/clipboard_history_menu_model_adapter.cc

@@ -33,11 +33,11 @@
 #include "ui/accessibility/ax_enums.mojom.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/models/menu_model.h"
-#include "ui/base/models/simple_menu_model.h"
 #include "ui/base/mojom/menu_source_type.mojom-forward.h"
 #include "ui/base/ui_base_types.h"
 #include "ui/chromeos/styles/cros_tokens_color_mappings.h"
 #include "ui/gfx/geometry/rect.h"
+#include "ui/menus/simple_menu_model.h"
 #include "ui/strings/grit/ui_strings.h"
 #include "ui/views/accessibility/view_accessibility.h"
 #include "ui/views/background.h"

ash/clipboard/clipboard_history_menu_model_adapter.h

@@ -13,8 +13,8 @@
 #include "base/memory/raw_ptr.h"
 #include "base/time/time.h"
 #include "chromeos/crosapi/mojom/clipboard_history.mojom.h"
-#include "ui/base/models/simple_menu_model.h"
 #include "ui/base/mojom/menu_source_type.mojom-forward.h"
+#include "ui/menus/simple_menu_model.h"
 #include "ui/views/controls/menu/menu_model_adapter.h"
 
 namespace gfx {

ash/clipboard/clipboard_history_menu_model_adapter_unittest.cc

@@ -26,9 +26,10 @@
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/base/clipboard/scoped_clipboard_writer.h"
 #include "ui/base/l10n/l10n_util.h"
-#include "ui/base/models/simple_menu_model.h"
 #include "ui/base/mojom/menu_source_type.mojom.h"
+#include "ui/base/ui_base_types.h"
 #include "ui/gfx/text_constants.h"
+#include "ui/menus/simple_menu_model.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/controls/menu/menu_item_view.h"
 #include "ui/views/controls/styled_label.h"

ash/public/cpp/BUILD.gn

@@ -487,6 +487,7 @@ component("cpp") {
     "//ui/events/ozone/layout",
     "//ui/message_center/public/cpp",
     "//ui/strings:ui_strings_grit",
+    "//ui/touch_selection",
     "//ui/views",
     "//ui/wm",
     "//ui/wm/public",

ash/public/cpp/app_list/app_list_client.h

@@ -17,7 +17,7 @@
 #include "base/time/time.h"
 #include "components/account_id/account_id.h"
 #include "mojo/public/cpp/bindings/pending_receiver.h"
-#include "ui/base/models/simple_menu_model.h"
+#include "ui/menus/simple_menu_model.h"
 #include "url/gurl.h"
 
 namespace ash {

ash/public/cpp/shelf_item_delegate.cc

@@ -4,7 +4,7 @@
 
 #include "ash/public/cpp/shelf_item_delegate.h"
 
-#include "ui/base/models/simple_menu_model.h"
+#include "ui/menus/simple_menu_model.h"
 
 namespace ash {
 

ash/public/cpp/views_text_services_context_menu_ash.cc

@@ -11,8 +11,8 @@
 #include "chromeos/ui/clipboard_history/clipboard_history_submenu_model.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/menu_source_utils.h"
-#include "ui/base/pointer/touch_editing_controller.h"
 #include "ui/strings/grit/ui_strings.h"
+#include "ui/touch_selection/touch_editing_controller.h"
 #include "ui/views/controls/textfield/textfield.h"
 
 namespace ash {

ash/root_window_controller.cc

@@ -98,12 +98,12 @@
 #include "ui/aura/window_tracker.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/models/menu_model.h"
-#include "ui/base/models/simple_menu_model.h"
 #include "ui/base/mojom/menu_source_type.mojom.h"
 #include "ui/compositor/layer.h"
 #include "ui/display/screen.h"
 #include "ui/display/types/display_constants.h"
 #include "ui/events/event_utils.h"
+#include "ui/menus/simple_menu_model.h"
 #include "ui/views/controls/menu/menu_runner.h"
 #include "ui/views/widget/widget.h"
 #include "ui/wm/core/capture_controller.h"

ash/shelf/kiosk_apps_button.cc

@@ -18,9 +18,9 @@
 #include "skia/ext/image_operations.h"
 #include "third_party/skia/include/core/SkPath.h"
 #include "ui/base/metadata/metadata_impl_macros.h"
-#include "ui/base/models/simple_menu_model.h"
 #include "ui/base/mojom/menu_source_type.mojom.h"
 #include "ui/gfx/image/image_skia_operations.h"
+#include "ui/menus/simple_menu_model.h"
 #include "ui/views/controls/menu/menu_runner.h"
 
 namespace ash {

ash/shelf/kiosk_apps_button.h

@@ -15,7 +15,7 @@
 #include "base/memory/raw_ptr.h"
 #include "components/account_id/account_id.h"
 #include "ui/base/metadata/metadata_header_macros.h"
-#include "ui/base/models/simple_menu_model.h"
+#include "ui/menus/simple_menu_model.h"
 #include "ui/views/controls/button/menu_button_controller.h"
 #include "ui/views/controls/menu/menu_runner.h"
 

ash/shelf/shelf_application_menu_model.h

@@ -13,8 +13,8 @@
 #include "ash/public/cpp/shelf_item_delegate.h"
 #include "base/containers/flat_set.h"
 #include "base/memory/raw_ptr.h"
-#include "ui/base/models/simple_menu_model.h"
 #include "ui/gfx/image/image_skia.h"
+#include "ui/menus/simple_menu_model.h"
 
 namespace ash {
 

ash/shelf/shelf_context_menu_model.h

@@ -10,7 +10,7 @@
 
 #include "ash/ash_export.h"
 #include "base/memory/raw_ptr.h"
-#include "ui/base/models/simple_menu_model.h"
+#include "ui/menus/simple_menu_model.h"
 
 namespace ash {
 

ash/shelf/shelf_menu_model_adapter.cc

@@ -6,8 +6,8 @@
 
 #include "ash/public/cpp/app_menu_constants.h"
 #include "base/metrics/histogram_macros.h"
-#include "ui/base/models/simple_menu_model.h"
 #include "ui/base/mojom/menu_source_type.mojom-forward.h"
+#include "ui/menus/simple_menu_model.h"
 #include "ui/views/view.h"
 
 namespace ash {

ash/shelf/shelf_view.cc

@@ -72,7 +72,6 @@
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/menu_source_utils.h"
 #include "ui/base/metadata/metadata_impl_macros.h"
-#include "ui/base/models/simple_menu_model.h"
 #include "ui/base/mojom/menu_source_type.mojom.h"
 #include "ui/base/ui_base_features.h"
 #include "ui/color/color_id.h"
@@ -90,6 +89,7 @@
 #include "ui/gfx/geometry/rect.h"
 #include "ui/gfx/geometry/transform_util.h"
 #include "ui/gfx/image/image_skia.h"
+#include "ui/menus/simple_menu_model.h"
 #include "ui/views/accessibility/view_accessibility.h"
 #include "ui/views/animation/bounds_animator.h"
 #include "ui/views/animation/ink_drop.h"

ash/shell_unittest.cc

@@ -47,7 +47,6 @@
 #include "ui/aura/env.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_event_dispatcher.h"
-#include "ui/base/models/simple_menu_model.h"
 #include "ui/base/mojom/menu_source_type.mojom.h"
 #include "ui/base/mojom/ui_base_types.mojom-shared.h"
 #include "ui/display/scoped_display_for_new_windows.h"
@@ -55,6 +54,7 @@
 #include "ui/events/test/events_test_utils.h"
 #include "ui/events/test/test_event_handler.h"
 #include "ui/gfx/geometry/size.h"
+#include "ui/menus/simple_menu_model.h"
 #include "ui/views/controls/menu/menu_controller.h"
 #include "ui/views/controls/menu/menu_runner.h"
 #include "ui/views/widget/widget.h"

ash/system/holding_space/holding_space_tray.h

@@ -25,8 +25,8 @@
 #include "base/scoped_observation.h"
 #include "base/timer/timer.h"
 #include "ui/base/metadata/metadata_header_macros.h"
-#include "ui/base/models/simple_menu_model.h"
 #include "ui/compositor/layer_tree_owner.h"
+#include "ui/menus/simple_menu_model.h"
 #include "ui/views/widget/widget.h"
 #include "ui/views/widget/widget_observer.h"
 

ash/system/holding_space/holding_space_view_delegate.cc

@@ -35,11 +35,11 @@
 #include "ui/base/dragdrop/mojom/drag_drop_types.mojom.h"
 #include "ui/base/dragdrop/os_exchange_data_provider.h"
 #include "ui/base/l10n/l10n_util.h"
-#include "ui/base/models/simple_menu_model.h"
 #include "ui/base/mojom/menu_source_type.mojom.h"
 #include "ui/color/color_id.h"
 #include "ui/display/screen.h"
 #include "ui/display/tablet_state.h"
+#include "ui/menus/simple_menu_model.h"
 #include "ui/views/controls/menu/menu_runner.h"
 #include "ui/views/focus/focus_manager.h"
 #include "ui/views/vector_icons.h"

ash/system/holding_space/holding_space_view_delegate.h

@@ -14,9 +14,9 @@
 #include "base/callback_list.h"
 #include "base/memory/raw_ptr.h"
 #include "base/scoped_observation.h"
-#include "ui/base/models/simple_menu_model.h"
 #include "ui/base/mojom/menu_source_type.mojom-forward.h"
 #include "ui/display/display_observer.h"
+#include "ui/menus/simple_menu_model.h"
 #include "ui/views/context_menu_controller.h"
 #include "ui/views/drag_controller.h"
 #include "ui/views/view.h"

ash/system/phonehub/camera_roll_menu_model.h

@@ -6,7 +6,7 @@
 #define ASH_SYSTEM_PHONEHUB_CAMERA_ROLL_MENU_MODEL_H_
 
 #include "ash/ash_export.h"
-#include "ui/base/models/simple_menu_model.h"
+#include "ui/menus/simple_menu_model.h"
 
 namespace ash {
 

ash/system/phonehub/camera_roll_thumbnail.h

@@ -13,9 +13,9 @@
 #include "base/time/time.h"
 #include "chromeos/ash/components/phonehub/camera_roll_item.h"
 #include "ui/base/metadata/metadata_header_macros.h"
-#include "ui/base/models/simple_menu_model.h"
 #include "ui/base/mojom/menu_source_type.mojom-forward.h"
 #include "ui/gfx/canvas.h"
+#include "ui/menus/simple_menu_model.h"
 #include "ui/views/context_menu_controller.h"
 #include "ui/views/controls/button/menu_button.h"
 #include "ui/views/controls/menu/menu_runner.h"

ash/system/phonehub/phone_hub_tray.h

@@ -24,9 +24,9 @@
 #include "chromeos/ash/components/phonehub/icon_decoder.h"
 #include "chromeos/ash/components/phonehub/phone_hub_manager.h"
 #include "ui/base/metadata/metadata_header_macros.h"
-#include "ui/base/models/simple_menu_model.h"
 #include "ui/display/manager/display_manager_observer.h"
 #include "ui/events/event.h"
+#include "ui/menus/simple_menu_model.h"
 #include "ui/views/controls/button/image_button.h"
 
 namespace views {

ash/system/tray/tray_background_view_unittest.cc

@@ -20,12 +20,12 @@
 #include "base/memory/raw_ptr.h"
 #include "base/test/metrics/histogram_tester.h"
 #include "base/test/task_environment.h"
-#include "ui/base/models/simple_menu_model.h"
 #include "ui/compositor/layer_animator.h"
 #include "ui/compositor/scoped_animation_duration_scale_mode.h"
 #include "ui/compositor/test/layer_animation_stopped_waiter.h"
 #include "ui/display/manager/display_manager.h"
 #include "ui/display/manager/managed_display_info.h"
+#include "ui/menus/simple_menu_model.h"
 #include "ui/views/accessibility/view_accessibility.h"
 
 namespace ash {

ash/system/unified/power_button.cc

@@ -32,7 +32,6 @@
 #include "ui/base/metadata/metadata_impl_macros.h"
 #include "ui/base/models/image_model.h"
 #include "ui/base/models/menu_separator_types.h"
-#include "ui/base/models/simple_menu_model.h"
 #include "ui/base/mojom/menu_source_type.mojom.h"
 #include "ui/chromeos/styles/cros_tokens_color_mappings.h"
 #include "ui/color/color_id.h"
@@ -43,6 +42,7 @@
 #include "ui/gfx/geometry/insets.h"
 #include "ui/gfx/geometry/point.h"
 #include "ui/gfx/geometry/rounded_corners_f.h"
+#include "ui/menus/simple_menu_model.h"
 #include "ui/views/accessibility/view_accessibility.h"
 #include "ui/views/context_menu_controller.h"
 #include "ui/views/controls/focus_ring.h"

ash/system/video_conference/bubble/settings_button.cc

@@ -15,8 +15,8 @@
 #include "ash/system/video_conference/video_conference_utils.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/metadata/metadata_impl_macros.h"
-#include "ui/base/models/simple_menu_model.h"
 #include "ui/base/mojom/menu_source_type.mojom.h"
+#include "ui/menus/simple_menu_model.h"
 #include "ui/views/accessibility/view_accessibility.h"
 #include "ui/views/context_menu_controller.h"
 #include "ui/views/controls/button/toggle_button.h"

ash/wm/desks/desk_action_context_menu.cc

@@ -19,10 +19,10 @@
 #include "ash/wm/overview/overview_utils.h"
 #include "base/metrics/histogram_functions.h"
 #include "ui/base/l10n/l10n_util.h"
-#include "ui/base/models/simple_menu_model.h"
 #include "ui/base/mojom/menu_source_type.mojom-forward.h"
 #include "ui/chromeos/styles/cros_tokens_color_mappings.h"
 #include "ui/gfx/image/image_skia_operations.h"
+#include "ui/menus/simple_menu_model.h"
 #include "ui/views/accessibility/view_accessibility.h"
 #include "ui/views/controls/image_view.h"
 #include "ui/views/controls/menu/menu_item_view.h"

ash/wm/desks/desk_action_context_menu.h

@@ -8,8 +8,8 @@
 #include "ash/public/cpp/desk_profiles_delegate.h"
 #include "ash/wm/desks/desk_mini_view.h"
 #include "ui/base/models/menu_model.h"
-#include "ui/base/models/simple_menu_model.h"
 #include "ui/base/mojom/menu_source_type.mojom-forward.h"
+#include "ui/menus/simple_menu_model.h"
 #include "ui/views/context_menu_controller.h"
 #include "ui/views/controls/menu/menu_types.h"
 

ash/wm/desks/templates/saved_desk_unittest.cc

@@ -86,13 +86,13 @@
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/test/test_window_delegate.h"
 #include "ui/base/cursor/mojom/cursor_type.mojom-shared.h"
-#include "ui/base/models/simple_menu_model.h"
 #include "ui/compositor/layer.h"
 #include "ui/compositor/layer_animator.h"
 #include "ui/compositor/scoped_animation_duration_scale_mode.h"
 #include "ui/events/keycodes/keyboard_codes_posix.h"
 #include "ui/events/test/event_generator.h"
 #include "ui/gfx/canvas.h"
+#include "ui/menus/simple_menu_model.h"
 #include "ui/views/accessibility/view_accessibility.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/controls/menu/menu_item_view.h"

ash/wm/overview/birch/birch_bar_context_menu_model.h

@@ -6,7 +6,7 @@
 #define ASH_WM_OVERVIEW_BIRCH_BIRCH_BAR_CONTEXT_MENU_MODEL_H_
 
 #include "ash/ash_export.h"
-#include "ui/base/models/simple_menu_model.h"
+#include "ui/menus/simple_menu_model.h"
 
 namespace ash {
 

ash/wm/overview/birch/birch_bar_controller.h

@@ -14,10 +14,10 @@
 #include "base/memory/weak_ptr.h"
 #include "base/scoped_observation.h"
 #include "components/prefs/pref_change_registrar.h"
-#include "ui/base/models/simple_menu_model.h"
 #include "ui/base/mojom/menu_source_type.mojom-forward.h"
 #include "ui/base/ui_base_types.h"
 #include "ui/gfx/geometry/point.h"
+#include "ui/menus/simple_menu_model.h"
 
 class PrefRegistrySimple;
 

ash/wm/overview/birch/birch_chip_button.h

@@ -11,7 +11,7 @@
 #include "base/gtest_prod_util.h"
 #include "ui/base/metadata/metadata_header_macros.h"
 #include "ui/base/models/image_model.h"
-#include "ui/base/models/simple_menu_model.h"
+#include "ui/menus/simple_menu_model.h"
 #include "ui/views/metadata/view_factory.h"
 
 namespace views {

ash/wm/overview/birch/birch_chip_context_menu_model.h

@@ -9,7 +9,7 @@
 #include "ash/wm/overview/birch/birch_bar_constants.h"
 #include "ash/wm/overview/birch/birch_bar_context_menu_model.h"
 #include "base/types/cxx23_to_underlying.h"
-#include "ui/base/models/simple_menu_model.h"
+#include "ui/menus/simple_menu_model.h"
 
 namespace ash {
 

ash/wm/window_restore/informed_restore_context_menu_model.h

@@ -6,7 +6,7 @@
 #define ASH_WM_WINDOW_RESTORE_INFORMED_RESTORE_CONTEXT_MENU_MODEL_H_
 
 #include "ash/ash_export.h"
-#include "ui/base/models/simple_menu_model.h"
+#include "ui/menus/simple_menu_model.h"
 
 namespace ash {
 

chrome/browser/BUILD.gn

@@ -2496,6 +2496,7 @@ static_library("browser") {
     "//ui/gfx/geometry",
     "//ui/gl",
     "//ui/gl:buildflags",
+    "//ui/menus",
     "//ui/message_center",
     "//ui/message_center/public/cpp",
     "//ui/resources",

chrome/browser/apps/app_service/menu_util.h

@@ -15,7 +15,7 @@
 #include "components/services/app_service/public/cpp/menu.h"
 #include "ui/base/interaction/element_identifier.h"
 #include "ui/base/models/menu_separator_types.h"
-#include "ui/base/models/simple_menu_model.h"
+#include "ui/menus/simple_menu_model.h"
 
 class Profile;
 

chrome/browser/ash/app_list/app_context_menu.h

@@ -12,7 +12,7 @@
 #include "base/functional/callback.h"
 #include "base/memory/raw_ptr.h"
 #include "ui/base/models/image_model.h"
-#include "ui/base/models/simple_menu_model.h"
+#include "ui/menus/simple_menu_model.h"
 
 class AppListControllerDelegate;
 class Profile;

chrome/browser/ash/app_list/app_list_client_impl_browsertest.cc

@@ -105,11 +105,11 @@
 #include "extensions/browser/extension_prefs.h"
 #include "extensions/common/constants.h"
 #include "ui/aura/window.h"
-#include "ui/base/models/simple_menu_model.h"
 #include "ui/display/display.h"
 #include "ui/display/scoped_display_for_new_windows.h"
 #include "ui/display/screen.h"
 #include "ui/display/test/display_manager_test_api.h"
+#include "ui/menus/simple_menu_model.h"
 #include "ui/wm/core/window_util.h"
 
 // Browser Test for AppListClientImpl.

chrome/browser/ash/app_list/app_service/app_service_context_menu_browsertest.cc

@@ -20,7 +20,7 @@
 #include "chrome/test/base/in_process_browser_test.h"
 #include "components/webapps/common/web_app_id.h"
 #include "content/public/test/browser_test.h"
-#include "ui/base/models/simple_menu_model.h"
+#include "ui/menus/simple_menu_model.h"
 #include "ui/views/vector_icons.h"
 #include "url/gurl.h"
 

chrome/browser/ash/app_list/extension_app_utils.cc

@@ -14,9 +14,9 @@
 #include "extensions/common/extension.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/models/image_model.h"
-#include "ui/base/models/simple_menu_model.h"
 #include "ui/color/color_id.h"
 #include "ui/gfx/paint_vector_icon.h"
+#include "ui/menus/simple_menu_model.h"
 #include "ui/views/controls/menu/menu_config.h"
 #include "ui/views/vector_icons.h"
 

chrome/browser/ash/app_list/search/chrome_search_result.h

@@ -18,7 +18,7 @@
 #include "chrome/browser/ash/app_list/app_list_model_updater.h"
 #include "chrome/browser/ash/app_list/search/scoring.h"
 #include "chromeos/crosapi/mojom/launcher_search.mojom.h"
-#include "ui/base/models/simple_menu_model.h"
+#include "ui/menus/simple_menu_model.h"
 #include "url/gurl.h"
 
 namespace ui {

chrome/browser/ash/arc/app_shortcuts/arc_app_shortcuts_menu_builder.cc

@@ -18,7 +18,7 @@
 #include "chrome/browser/ash/arc/app_shortcuts/arc_app_shortcuts_request.h"
 #include "chrome/browser/profiles/profile.h"
 #include "ui/base/models/image_model.h"
-#include "ui/base/models/simple_menu_model.h"
+#include "ui/menus/simple_menu_model.h"
 
 namespace arc {
 

chrome/browser/ash/arc/app_shortcuts/arc_app_shortcuts_menu_builder_unittest.cc

@@ -16,8 +16,8 @@
 #include "chrome/test/base/testing_profile.h"
 #include "content/public/test/browser_task_environment.h"
 #include "testing/gtest/include/gtest/gtest.h"
-#include "ui/base/models/simple_menu_model.h"
 #include "ui/display/types/display_constants.h"
+#include "ui/menus/simple_menu_model.h"
 
 namespace arc {
 

chrome/browser/ash/system_web_apps/apps/boca_web_app_info.h

@@ -8,7 +8,7 @@
 #include <memory>
 
 #include "chrome/browser/ash/system_web_apps/types/system_web_app_delegate.h"
-#include "ui/base/models/simple_menu_model.h"
+#include "ui/menus/simple_menu_model.h"
 #include "url/gurl.h"
 
 namespace web_app {

chrome/browser/ash/system_web_apps/apps/boca_web_app_info_unittest.cc

@@ -9,7 +9,7 @@
 #include "base/test/scoped_feature_list.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "testing/gtest/include/gtest/gtest.h"
-#include "ui/base/models/simple_menu_model.h"
+#include "ui/menus/simple_menu_model.h"
 
 namespace {
 

chrome/browser/ash/system_web_apps/apps/terminal_system_web_app_info.cc

@@ -25,8 +25,8 @@
 #include "extensions/common/constants.h"
 #include "third_party/blink/public/mojom/manifest/display_mode.mojom.h"
 #include "ui/base/l10n/l10n_util.h"
-#include "ui/base/models/simple_menu_model.h"
 #include "ui/display/screen.h"
+#include "ui/menus/simple_menu_model.h"
 #include "url/gurl.h"
 #include "url/url_constants.h"
 

chrome/browser/ash/system_web_apps/types/BUILD.gn

@@ -24,6 +24,7 @@ static_library("types") {
     "//base",
     "//chrome/common",
     "//ui/base",
+    "//ui/menus",
     "//url",
   ]
 

chrome/browser/ash/system_web_apps/types/system_web_app_delegate.h

@@ -14,7 +14,7 @@
 #include "base/memory/raw_ptr.h"
 #include "build/chromeos_buildflags.h"
 #include "chrome/browser/ash/system_web_apps/types/system_web_app_background_task_info.h"
-#include "ui/base/models/simple_menu_model.h"
+#include "ui/menus/simple_menu_model.h"
 #include "url/gurl.h"
 #include "url/origin.h"
 

chrome/browser/chromeos/arc/open_with_menu.h

@@ -13,7 +13,7 @@
 #include "base/memory/raw_ptr.h"
 #include "components/arc/common/intent_helper/link_handler_model.h"
 #include "components/renderer_context_menu/render_view_context_menu_observer.h"
-#include "ui/base/models/simple_menu_model.h"
+#include "ui/menus/simple_menu_model.h"
 #include "url/gurl.h"
 
 class RenderViewContextMenuProxy;

chrome/browser/controlled_frame/controlled_frame_menu_icon_loader_unittest.cc

@@ -29,8 +29,8 @@
 #include "content/public/common/content_features.h"
 #include "services/data_decoder/public/cpp/test_support/in_process_data_decoder.h"
 #include "third_party/skia/include/core/SkColor.h"
-#include "ui/base/models/simple_menu_model.h"
 #include "ui/gfx/favicon_size.h"
+#include "ui/menus/simple_menu_model.h"
 
 namespace controlled_frame {
 

chrome/browser/download/download_shelf_context_menu.cc

@@ -17,8 +17,8 @@
 #include "content/public/common/content_features.h"
 #include "extensions/common/extension.h"
 #include "ui/base/l10n/l10n_util.h"
-#include "ui/base/models/simple_menu_model.h"
 #include "ui/gfx/color_palette.h"
+#include "ui/menus/simple_menu_model.h"
 
 using InsecureDownloadStatus = download::DownloadItem::InsecureDownloadStatus;
 

chrome/browser/download/download_shelf_context_menu.h

@@ -14,7 +14,7 @@
 #include "chrome/browser/download/download_commands.h"
 #include "chrome/browser/download/download_ui_model.h"
 #include "components/download/public/common/download_item.h"
-#include "ui/base/models/simple_menu_model.h"
+#include "ui/menus/simple_menu_model.h"
 
 // This class is responsible for the download shelf context menu. Platform
 // specific subclasses are responsible for creating and running the menu.

chrome/browser/extensions/BUILD.gn

@@ -968,6 +968,7 @@ source_set("extensions") {
     "//ui/base/ime",
     "//ui/gfx",
     "//ui/gfx/geometry",
+    "//ui/menus",
     "//ui/message_center",
     "//ui/message_center/public/cpp",
     "//ui/native_theme",

chrome/browser/extensions/context_menu_matcher.h

@@ -15,7 +15,7 @@
 #include "base/functional/callback.h"
 #include "base/memory/raw_ptr.h"
 #include "chrome/browser/extensions/menu_manager.h"
-#include "ui/base/models/simple_menu_model.h"
+#include "ui/menus/simple_menu_model.h"
 
 class ExtensionContextMenuBrowserTest;
 

chrome/browser/extensions/context_menu_matcher_unittest.cc

@@ -3,6 +3,7 @@
 // found in the LICENSE file.
 
 #include "chrome/browser/extensions/context_menu_matcher.h"
+
 #include <string>
 
 #include "base/functional/bind.h"
@@ -21,7 +22,7 @@
 #include "extensions/common/extension_id.h"
 #include "extensions/common/utils/extension_utils.h"
 #include "testing/gmock/include/gmock/gmock.h"
-#include "ui/base/models/simple_menu_model.h"
+#include "ui/menus/simple_menu_model.h"
 
 namespace extensions {
 

chrome/browser/extensions/extension_context_menu_model.h

@@ -11,7 +11,7 @@
 
 #include "base/memory/raw_ptr.h"
 #include "extensions/common/extension_id.h"
-#include "ui/base/models/simple_menu_model.h"
+#include "ui/menus/simple_menu_model.h"
 #include "url/origin.h"
 
 class Browser;

chrome/browser/lacros/views_text_services_context_menu_lacros.cc

@@ -14,8 +14,8 @@
 #include "ui/base/data_transfer_policy/data_transfer_endpoint.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/menu_source_utils.h"
-#include "ui/base/pointer/touch_editing_controller.h"
 #include "ui/strings/grit/ui_strings.h"
+#include "ui/touch_selection/touch_editing_controller.h"
 #include "ui/views/controls/textfield/textfield.h"
 #include "ui/views/controls/views_text_services_context_menu_base.h"
 

chrome/browser/media_galleries/media_galleries_permission_controller.cc

@@ -26,8 +26,8 @@
 #include "extensions/common/extension.h"
 #include "extensions/common/permissions/permissions_data.h"
 #include "ui/base/l10n/l10n_util.h"
-#include "ui/base/models/simple_menu_model.h"
 #include "ui/base/text/bytes_formatting.h"
+#include "ui/menus/simple_menu_model.h"
 #include "ui/shell_dialogs/selected_file_info.h"
 
 using extensions::APIPermission;

chrome/browser/media_galleries/media_gallery_context_menu.h

@@ -7,7 +7,7 @@
 
 #include "base/functional/callback.h"
 #include "chrome/browser/media_galleries/media_galleries_preferences.h"
-#include "ui/base/models/simple_menu_model.h"
+#include "ui/menus/simple_menu_model.h"
 
 class MediaGalleryContextMenu : public ui::SimpleMenuModel,
                                 public ui::SimpleMenuModel::Delegate {

chrome/browser/renderer_context_menu/mock_render_view_context_menu.h

@@ -13,7 +13,7 @@
 #include "base/memory/raw_ptr.h"
 #include "components/renderer_context_menu/render_view_context_menu_proxy.h"
 #include "ui/base/models/image_model.h"
-#include "ui/base/models/simple_menu_model.h"
+#include "ui/menus/simple_menu_model.h"
 
 class PrefService;
 class Profile;

chrome/browser/renderer_context_menu/render_view_context_menu.h

@@ -35,9 +35,9 @@
 #include "printing/buildflags/buildflags.h"
 #include "third_party/blink/public/mojom/frame/frame.mojom-forward.h"
 #include "ui/base/interaction/element_identifier.h"
-#include "ui/base/models/simple_menu_model.h"
 #include "ui/base/window_open_disposition.h"
 #include "ui/gfx/geometry/vector2d.h"
+#include "ui/menus/simple_menu_model.h"
 
 #if BUILDFLAG(ENABLE_COMPOSE)
 #include "chrome/browser/compose/chrome_compose_client.h"

chrome/browser/renderer_context_menu/spelling_options_submenu_observer.h

@@ -12,7 +12,7 @@
 #include "chrome/browser/spellchecker/spellcheck_service.h"
 #include "components/prefs/pref_member.h"
 #include "components/renderer_context_menu/render_view_context_menu_observer.h"
-#include "ui/base/models/simple_menu_model.h"
+#include "ui/menus/simple_menu_model.h"
 
 class RenderViewContextMenuProxy;
 

chrome/browser/sharing/click_to_call/click_to_call_context_menu_observer.h

@@ -15,7 +15,7 @@
 #include "chrome/browser/sharing/click_to_call/click_to_call_metrics.h"
 #include "components/renderer_context_menu/render_view_context_menu_observer.h"
 #include "components/sharing_message/sharing_target_device_info.h"
-#include "ui/base/models/simple_menu_model.h"
+#include "ui/menus/simple_menu_model.h"
 
 class RenderViewContextMenuProxy;
 

chrome/browser/status_icons/status_icon_menu_model.h

@@ -10,7 +10,7 @@
 #include "base/memory/raw_ptr.h"
 #include "base/observer_list.h"
 #include "ui/base/models/image_model.h"
-#include "ui/base/models/simple_menu_model.h"
+#include "ui/menus/simple_menu_model.h"
 
 namespace gfx {
 class Image;

chrome/browser/ui/BUILD.gn

@@ -663,6 +663,7 @@ static_library("ui") {
     "//ui/events:gesture_detection",
     "//ui/gfx",
     "//ui/gfx/geometry",
+    "//ui/menus",
     "//ui/message_center",
     "//ui/message_center/public/cpp",
     "//ui/native_theme",

chrome/browser/ui/ash/multi_user/multi_user_context_menu_chromeos.cc

@@ -25,7 +25,7 @@
 #include "components/user_manager/user_manager_pref_names.h"
 #include "ui/aura/window.h"
 #include "ui/base/l10n/l10n_util.h"
-#include "ui/base/models/simple_menu_model.h"
+#include "ui/menus/simple_menu_model.h"
 
 namespace {
 

chrome/browser/ui/ash/shelf/app_service/app_service_promise_app_shelf_context_menu_browsertest.cc

@@ -21,8 +21,8 @@
 #include "chrome/test/base/in_process_browser_test.h"
 #include "components/services/app_service/public/cpp/package_id.h"
 #include "content/public/test/browser_test.h"
-#include "ui/base/models/simple_menu_model.h"
 #include "ui/display/display.h"
+#include "ui/menus/simple_menu_model.h"
 
 class AppServicePromiseAppShelfContextMenuBrowserTest
     : public InProcessBrowserTest {

chrome/browser/ui/ash/shelf/app_service/app_service_shelf_context_menu_browsertest.cc

@@ -42,8 +42,8 @@
 #include "content/public/common/content_features.h"
 #include "content/public/test/browser_test.h"
 #include "third_party/blink/public/common/features.h"
-#include "ui/base/models/simple_menu_model.h"
 #include "ui/display/display.h"
+#include "ui/menus/simple_menu_model.h"
 #include "ui/views/vector_icons.h"
 
 class AppServiceShelfContextMenuBrowserTest : public InProcessBrowserTest {

chrome/browser/ui/ash/shelf/extension_shelf_context_menu_browsertest.cc

@@ -12,8 +12,8 @@
 #include "chrome/browser/extensions/extension_browsertest.h"
 #include "chrome/browser/ui/ash/shelf/chrome_shelf_controller_util.h"
 #include "content/public/test/browser_test.h"
-#include "ui/base/models/simple_menu_model.h"
 #include "ui/display/display.h"
+#include "ui/menus/simple_menu_model.h"
 #include "ui/views/vector_icons.h"
 
 class ExtensionShelfContextMenuBrowserTest

chrome/browser/ui/ash/shelf/isolated_web_app_installer_context_menu.cc

@@ -7,9 +7,9 @@
 #include "base/functional/callback_forward.h"
 #include "chrome/grit/generated_resources.h"
 #include "ui/base/models/image_model.h"
-#include "ui/base/models/simple_menu_model.h"
 #include "ui/color/color_id.h"
 #include "ui/gfx/vector_icon_types.h"
+#include "ui/menus/simple_menu_model.h"
 #include "ui/views/vector_icons.h"
 
 namespace {

chrome/browser/ui/ash/shelf/isolated_web_app_installer_context_menu.h

@@ -8,7 +8,7 @@
 #include <memory>
 
 #include "base/functional/callback_forward.h"
-#include "ui/base/models/simple_menu_model.h"
+#include "ui/menus/simple_menu_model.h"
 
 // A simple Ash shelf context menu for an Isolated Web App installer instance.
 // Currently only supports "Close".

chrome/browser/ui/ash/shelf/isolated_web_app_installer_shelf_item_controller_unittest.cc

@@ -17,7 +17,7 @@
 #include "ui/aura/test/test_window_delegate.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_observer.h"
-#include "ui/base/models/simple_menu_model.h"
+#include "ui/menus/simple_menu_model.h"
 #include "ui/views/widget/widget.h"
 
 class IsolatedWebAppInstallerShelfItemControllerTest : public ash::AshTestBase {

chrome/browser/ui/ash/shelf/shelf_context_menu.h

@@ -8,8 +8,8 @@
 #include "ash/public/cpp/app_menu_constants.h"
 #include "ash/public/cpp/shelf_item.h"
 #include "base/memory/raw_ptr.h"
-#include "ui/base/models/simple_menu_model.h"
 #include "ui/gfx/vector_icon_types.h"
+#include "ui/menus/simple_menu_model.h"
 
 class ChromeShelfController;
 

chrome/browser/ui/ash/shelf/standalone_browser_extension_app_context_menu.h

@@ -8,7 +8,7 @@
 #include <string>
 
 #include "base/memory/weak_ptr.h"
-#include "ui/base/models/simple_menu_model.h"
+#include "ui/menus/simple_menu_model.h"
 
 // This class is responsible for displaying a context menu for a
 // standalone-browser based extension app. Note that this class is used for both

chrome/browser/ui/ash/shelf/standalone_browser_extension_app_shelf_item_controller.cc

@@ -26,7 +26,7 @@
 #include "chrome/browser/ui/ash/shelf/standalone_browser_extension_app_context_menu.h"
 #include "components/services/app_service/public/cpp/app_types.h"
 #include "components/services/app_service/public/cpp/instance_registry.h"
-#include "ui/base/models/simple_menu_model.h"
+#include "ui/menus/simple_menu_model.h"
 #include "ui/views/widget/widget.h"
 
 StandaloneBrowserExtensionAppShelfItemController::

chrome/browser/ui/autofill/BUILD.gn

@@ -94,6 +94,7 @@ source_set("autofill") {
       "//components/user_education/common",
       "//third_party/abseil-cpp:absl",
       "//ui/base",
+      "//ui/menus",
       "//ui/views",
     ]
   }

chrome/browser/ui/autofill/autofill_context_menu_manager.h

@@ -13,7 +13,7 @@
 #include "components/renderer_context_menu/render_view_context_menu_base.h"
 #include "components/renderer_context_menu/render_view_context_menu_observer.h"
 #include "content/public/browser/context_menu_params.h"
-#include "ui/base/models/simple_menu_model.h"
+#include "ui/menus/simple_menu_model.h"
 
 namespace password_manager {
 class ContentPasswordManagerDriver;

chrome/browser/ui/bookmarks/BUILD.gn

@@ -32,6 +32,7 @@ source_set("bookmarks") {
     "//ui/base/dragdrop/mojom",
     "//ui/gfx",
     "//ui/gfx/geometry",
+    "//ui/menus",
     "//url",
   ]
 

chrome/browser/ui/bookmarks/bookmark_context_menu_controller.h

@@ -13,8 +13,8 @@
 #include "base/memory/weak_ptr.h"
 #include "chrome/browser/ui/bookmarks/bookmark_stats.h"
 #include "components/bookmarks/browser/base_bookmark_model_observer.h"
-#include "ui/base/models/simple_menu_model.h"
 #include "ui/gfx/native_widget_types.h"
+#include "ui/menus/simple_menu_model.h"
 
 class Browser;
 class Profile;

chrome/browser/ui/browser_actions.cc

@@ -57,10 +57,10 @@
 #include "ui/accessibility/accessibility_features.h"
 #include "ui/actions/actions.h"
 #include "ui/base/l10n/l10n_util.h"
-#include "ui/base/models/simple_menu_model.h"
 #include "ui/base/ui_base_features.h"
 #include "ui/gfx/text_utils.h"
 #include "ui/gfx/vector_icon_types.h"
+#include "ui/menus/simple_menu_model.h"
 
 namespace {
 

chrome/browser/ui/cocoa/bookmarks/bookmark_menu_cocoa_controller.mm

@@ -22,8 +22,8 @@
 #include "components/bookmarks/browser/bookmark_utils.h"
 #include "components/profile_metrics/browser_profile_type.h"
 #import "ui/base/cocoa/cocoa_base_utils.h"
-#import "ui/base/cocoa/menu_controller.h"
 #include "ui/base/window_open_disposition.h"
+#import "ui/menus/cocoa/menu_controller.h"
 
 using base::UserMetricsAction;
 using bookmarks::BookmarkModel;

chrome/browser/ui/cocoa/renderer_context_menu/render_view_context_menu_mac.h

@@ -8,7 +8,7 @@
 #import <Cocoa/Cocoa.h>
 
 #include "chrome/browser/renderer_context_menu/render_view_context_menu.h"
-#include "ui/base/cocoa/text_services_context_menu.h"
+#include "ui/menus/cocoa/text_services_context_menu.h"
 
 // Mac implementation of the context menu display code. Uses a Cocoa NSMenu
 // to display the context menu. Internally uses an obj-c object as the

chrome/browser/ui/cocoa/renderer_context_menu/render_view_context_menu_mac_cocoa.mm

@@ -3,23 +3,23 @@
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/cocoa/renderer_context_menu/render_view_context_menu_mac_cocoa.h"
-#include "base/memory/raw_ptr.h"
 
 #include <utility>
 
 #include "base/compiler_specific.h"
 #include "base/mac/mac_util.h"
 #import "base/mac/scoped_sending_event.h"
+#include "base/memory/raw_ptr.h"
 #import "base/message_loop/message_pump_apple.h"
 #include "base/strings/sys_string_conversions.h"
 #include "base/task/current_thread.h"
 #include "chrome/browser/headless/headless_mode_util.h"
 #import "components/remote_cocoa/app_shim/menu_controller_cocoa_delegate_impl.h"
 #include "content/public/browser/web_contents.h"
-#import "ui/base/cocoa/menu_controller.h"
 #include "ui/base/cocoa/menu_utils.h"
 #include "ui/base/interaction/element_tracker_mac.h"
 #include "ui/color/color_provider.h"
+#import "ui/menus/cocoa/menu_controller.h"
 #include "ui/views/controls/menu/menu_controller_cocoa_delegate_params.h"
 #include "ui/views/interaction/element_tracker_views.h"
 #include "ui/views/widget/widget.h"

chrome/browser/ui/cocoa/renderer_context_menu/render_view_context_menu_mac_unittest.mm

@@ -12,7 +12,7 @@
 #include "content/public/test/test_renderer_host.h"
 #include "content/public/test/web_contents_tester.h"
 #include "testing/gtest/include/gtest/gtest.h"
-#include "ui/base/cocoa/text_services_context_menu.h"
+#include "ui/menus/cocoa/text_services_context_menu.h"
 
 namespace {
 

chrome/browser/ui/cocoa/status_icons/status_icon_mac.mm

@@ -12,8 +12,8 @@
 #include "base/strings/sys_string_conversions.h"
 #include "skia/ext/skia_utils_mac.h"
 #include "third_party/skia/include/core/SkBitmap.h"
-#import "ui/base/cocoa/menu_controller.h"
 #include "ui/gfx/image/image_skia.h"
+#import "ui/menus/cocoa/menu_controller.h"
 #include "ui/message_center/public/cpp/notifier_id.h"
 
 @interface StatusItemController : NSObject {

chrome/browser/ui/lens/BUILD.gn

@@ -147,6 +147,7 @@ source_set("lens") {
     "//ui/gfx:gfx",
     "//ui/gfx/codec:codec",
     "//ui/gfx/geometry:geometry",
+    "//ui/menus",
     "//ui/views",
     "//ui/webui",
     "//url",