[cr132] SimpleMenuModel header moved to new path

This is a simple change:

 - `ui/base/models/simple_menu_model.h` =>
   `ui/base/models/simple_menu_model.h`
 - `ui/menus/simple_menu_model.cc` =>
   `ui/base/models/simple_menu_model.cc`

Chromium change:
https://chromium.googlesource.com/chromium/src/+/f1147f74e2db4891bd99bd6a5d0feffe8b453ab2

commit f1147f74e2db4891bd99bd6a5d0feffe8b453ab2
Author: Joseph Park <josephjoopark@chromium.org>
Date:   Fri Oct 18 17:39:17 2024 +0000

    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

browser/brave_vpn/dns/BUILD.gn

@@ -13,6 +13,7 @@ source_set("unit_tests") {
   sources = [ "brave_vpn_dns_observer_service_win_unittest.cc" ]
   deps = [
     "//brave/components/brave_vpn/common",
+    "//chrome/browser/prefs",
     "//chrome/common:constants",
     "//chrome/test:test_support",
     "//net",

browser/brave_vpn/win/brave_vpn_wireguard_service/status_tray/BUILD.gn

@@ -27,6 +27,7 @@ source_set("status_tray") {
     "//chrome/common:channel_info",
     "//components/version_info:channel",
     "//ui/base",
+    "//ui/menus",
     "//ui/native_theme",
     "//ui/native_theme:native_theme_browser",
   ]
@@ -46,6 +47,7 @@ source_set("unit_tests") {
     "//brave/components/constants",
     "//brave/components/resources:strings_grit",
     "//testing/gtest",
+    "//ui/menus",
     "//ui/native_theme",
   ]
 }

browser/brave_vpn/win/brave_vpn_wireguard_service/status_tray/status_icon/BUILD.gn

@@ -33,5 +33,6 @@ source_set("status_icon") {
     ":utils",
     "//base",
     "//ui/gfx",
+    "//ui/menus",
   ]
 }

browser/brave_vpn/win/brave_vpn_wireguard_service/status_tray/status_icon/tray_menu_model.h

@@ -7,7 +7,7 @@
 #define BRAVE_BROWSER_BRAVE_VPN_WIN_BRAVE_VPN_WIREGUARD_SERVICE_STATUS_TRAY_STATUS_ICON_TRAY_MENU_MODEL_H_
 
 #include "base/memory/raw_ptr.h"
-#include "ui/base/models/simple_menu_model.h"
+#include "ui/menus/simple_menu_model.h"
 
 namespace brave_vpn {
 

browser/brave_vpn/win/brave_vpn_wireguard_service/status_tray/status_tray_runner.cc

@@ -6,9 +6,9 @@
 #include "brave/browser/brave_vpn/win/brave_vpn_wireguard_service/status_tray/status_tray_runner.h"
 
 #include <windows.h>  // Should be before shellapi.h
-#include <wrl/client.h>
 
 #include <shellapi.h>
+#include <wrl/client.h>
 
 #include <memory>
 #include <string>
@@ -31,7 +31,7 @@
 #include "brave/components/brave_vpn/common/win/utils.h"
 #include "components/grit/brave_components_strings.h"
 #include "ui/base/l10n/l10n_util.h"
-#include "ui/base/models/simple_menu_model.h"
+#include "ui/menus/simple_menu_model.h"
 #include "ui/native_theme/native_theme.h"
 
 namespace brave_vpn {

browser/brave_vpn/win/brave_vpn_wireguard_service/status_tray/status_tray_runner_unittest.cc

@@ -15,7 +15,7 @@
 #include "brave/browser/brave_vpn/win/storage_utils.h"
 #include "components/grit/brave_components_strings.h"
 #include "testing/gtest/include/gtest/gtest.h"
-#include "ui/base/models/simple_menu_model.h"
+#include "ui/menus/simple_menu_model.h"
 #include "ui/native_theme/native_theme.h"
 
 namespace brave_vpn {

browser/renderer_context_menu/brave_mock_render_view_context_menu.h

@@ -14,7 +14,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 BraveMockRenderViewContextMenu;
 class PrefService;

browser/ui/toolbar/app_menu_icons.cc

@@ -12,9 +12,9 @@
 #include "brave/components/vector_icons/vector_icons.h"
 #include "chrome/app/chrome_command_ids.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"
 
 namespace {
 

browser/ui/toolbar/bookmark_bar_sub_menu_model.cc

@@ -10,7 +10,7 @@
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/grit/generated_resources.h"
 #include "components/prefs/pref_service.h"
-#include "ui/base/models/simple_menu_model.h"
+#include "ui/menus/simple_menu_model.h"
 
 BookmarkBarSubMenuModel::BookmarkBarSubMenuModel(Profile* profile)
     : SimpleMenuModel(this), profile_(profile) {

browser/ui/toolbar/bookmark_bar_sub_menu_model.h

@@ -7,7 +7,7 @@
 #define BRAVE_BROWSER_UI_TOOLBAR_BOOKMARK_BAR_SUB_MENU_MODEL_H_
 
 #include "base/memory/raw_ptr.h"
-#include "ui/base/models/simple_menu_model.h"
+#include "ui/menus/simple_menu_model.h"
 
 class Profile;
 

browser/ui/toolbar/brave_app_menu_model.h

@@ -15,7 +15,7 @@
 #include "base/gtest_prod_util.h"
 #include "brave/components/brave_vpn/common/buildflags/buildflags.h"
 #include "chrome/browser/ui/toolbar/app_menu_model.h"
-#include "ui/base/models/simple_menu_model.h"
+#include "ui/menus/simple_menu_model.h"
 
 #if defined(TOOLKIT_VIEWS)
 #include "brave/components/sidebar/browser/sidebar_service.h"

browser/ui/toolbar/brave_vpn_menu_model.h

@@ -9,7 +9,7 @@
 #include <optional>
 
 #include "base/memory/raw_ptr.h"
-#include "ui/base/models/simple_menu_model.h"
+#include "ui/menus/simple_menu_model.h"
 
 class Browser;
 class PrefService;

browser/ui/toolbar/brave_vpn_menu_model_unittest.cc

@@ -20,7 +20,7 @@
 #include "components/sync_preferences/testing_pref_service_syncable.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/base/l10n/l10n_util.h"
-#include "ui/base/models/simple_menu_model.h"
+#include "ui/menus/simple_menu_model.h"
 
 class BraveVPNMenuModelUnitTest : public testing::Test {
  public:

browser/ui/views/brave_actions/brave_rewards_action_view.cc

@@ -35,7 +35,6 @@
 #include "components/prefs/pref_service.h"
 #include "extensions/common/constants.h"
 #include "ui/base/metadata/metadata_impl_macros.h"
-#include "ui/base/models/simple_menu_model.h"
 #include "ui/color/color_provider_manager.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/geometry/rect.h"
@@ -43,6 +42,7 @@
 #include "ui/gfx/image/image_skia.h"
 #include "ui/gfx/paint_vector_icon.h"
 #include "ui/gfx/skia_util.h"
+#include "ui/menus/simple_menu_model.h"
 #include "ui/views/animation/ink_drop_impl.h"
 #include "ui/views/controls/button/label_button_border.h"
 #include "ui/views/controls/button/menu_button_controller.h"

browser/ui/views/download/bubble/download_bubble_unittest.cc

@@ -15,7 +15,7 @@
 #include "content/public/test/browser_task_environment.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
-#include "ui/base/models/simple_menu_model.h"
+#include "ui/menus/simple_menu_model.h"
 #include "url/gurl.h"
 
 using download::DownloadItem;

browser/ui/views/sidebar/sidebar_control_view.h

@@ -13,7 +13,7 @@
 #include "base/scoped_observation.h"
 #include "brave/browser/ui/sidebar/sidebar_model.h"
 #include "brave/browser/ui/views/sidebar/sidebar_button_view.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/view.h"
 

browser/ui/views/sidebar/sidebar_items_contents_view.h

@@ -15,7 +15,7 @@
 #include "brave/browser/ui/sidebar/sidebar_model.h"
 #include "brave/browser/ui/views/sidebar/sidebar_button_view.h"
 #include "brave/components/sidebar/browser/sidebar_item.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/controls/button/button.h"
 #include "ui/views/view.h"

browser/ui/views/tabs/brave_tab_context_menu_contents.h

@@ -12,8 +12,8 @@
 #include "base/gtest_prod_util.h"
 #include "base/memory/raw_ptr.h"
 #include "base/memory/weak_ptr.h"
-#include "ui/base/models/simple_menu_model.h"
 #include "ui/base/ui_base_types.h"
+#include "ui/menus/simple_menu_model.h"
 
 class BraveBrowserTabStripController;
 class BraveTabMenuModel;

browser/ui/views/toolbar/ai_chat_button.cc

@@ -20,7 +20,7 @@
 #include "components/prefs/pref_service.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/menus/simple_menu_model.h"
 #include "ui/views/accessibility/view_accessibility.h"
 
 namespace {

browser/ui/views/toolbar/brave_vpn_button.cc

@@ -28,7 +28,6 @@
 #include "components/grit/brave_components_strings.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/compositor/layer.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/color_utils.h"
@@ -36,6 +35,7 @@
 #include "ui/gfx/geometry/rrect_f.h"
 #include "ui/gfx/paint_vector_icon.h"
 #include "ui/gfx/skia_util.h"
+#include "ui/menus/simple_menu_model.h"
 #include "ui/views/animation/ink_drop.h"
 #include "ui/views/animation/ink_drop_host.h"
 #include "ui/views/background.h"

browser/ui/views/toolbar/side_panel_button.cc

@@ -18,7 +18,7 @@
 #include "components/prefs/pref_service.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/menus/simple_menu_model.h"
 #include "ui/views/accessibility/view_accessibility.h"
 #include "ui/views/context_menu_controller.h"
 #include "ui/views/controls/button/button_controller.h"

browser/ui/views/toolbar/wallet_button.cc

@@ -27,11 +27,11 @@
 #include "components/prefs/pref_service.h"
 #include "content/public/browser/web_contents.h"
 #include "ui/base/metadata/metadata_impl_macros.h"
-#include "ui/base/models/simple_menu_model.h"
 #include "ui/color/color_provider_manager.h"
 #include "ui/gfx/geometry/rect_f.h"
 #include "ui/gfx/geometry/rrect_f.h"
 #include "ui/gfx/paint_vector_icon.h"
+#include "ui/menus/simple_menu_model.h"
 #include "ui/views/controls/highlight_path_generator.h"
 #include "ui/views/layout/fill_layout.h"
 

chromium_src/chrome/browser/ui/views/download/download_shelf_context_menu_view.cc

@@ -4,12 +4,13 @@
  * You can obtain one at https://mozilla.org/MPL/2.0/. */
 
 #include "chrome/browser/ui/views/download/download_shelf_context_menu_view.h"
+
 #include "brave/grit/brave_generated_resources.h"
 #include "chrome/browser/download/bubble/download_bubble_prefs.h"
 #include "chrome/browser/download/download_ui_model.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "ui/base/l10n/l10n_util.h"
-#include "ui/base/models/simple_menu_model.h"
+#include "ui/menus/simple_menu_model.h"
 
 #define DownloadShelfContextMenuView DownloadShelfContextMenuViewChromium
 

chromium_src/ui/menus/simple_menu_model.cc

@@ -3,7 +3,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this file,
  * You can obtain one at https://mozilla.org/MPL/2.0/. */
 
-#include "src/ui/base/models/simple_menu_model.cc"
+#include "src/ui/menus/simple_menu_model.cc"
 
 namespace ui {
 

chromium_src/ui/menus/simple_menu_model.h

@@ -3,15 +3,15 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this file,
  * You can obtain one at https://mozilla.org/MPL/2.0/. */
 
-#ifndef BRAVE_CHROMIUM_SRC_UI_BASE_MODELS_SIMPLE_MENU_MODEL_H_
-#define BRAVE_CHROMIUM_SRC_UI_BASE_MODELS_SIMPLE_MENU_MODEL_H_
+#ifndef BRAVE_CHROMIUM_SRC_UI_MENUS_SIMPLE_MENU_MODEL_H_
+#define BRAVE_CHROMIUM_SRC_UI_MENUS_SIMPLE_MENU_MODEL_H_
 
 #define AddButtonItem                                                        \
   AddButtonItemAt(int command_id, ButtonMenuItemModel* model, size_t index); \
   void AddButtonItem
 
-#include "src/ui/base/models/simple_menu_model.h"  // IWYU pragma: export
+#include "src/ui/menus/simple_menu_model.h"  // IWYU pragma: export
 
 #undef AddButtonItem
 
-#endif  // BRAVE_CHROMIUM_SRC_UI_BASE_MODELS_SIMPLE_MENU_MODEL_H_
+#endif  // BRAVE_CHROMIUM_SRC_UI_MENUS_SIMPLE_MENU_MODEL_H_