From fc3e044531cf8d3c1cd057cd2e53ee15902b56fc Mon Sep 17 00:00:00 2001 From: Claudio DeSouza Date: Fri, 22 Aug 2025 17:22:49 +0100 Subject: [PATCH] [cr141] `c/b/u/views/accelerator_table.{h,cc}` moved to parent dirctory. Chromium changes: https://chromium.googlesource.com/chromium/src/+/5abc5e8f21ad8b9e1de5d27491edc68a66ec0ad9 commit 5abc5e8f21ad8b9e1de5d27491edc68a66ec0ad9 Author: Paul Jensen Date: Wed Aug 20 18:28:57 2025 -0700 Move c/b/ui/views/accelerator_table.{h,cc} into parent directory This makes it available for use outside c/b/ui/views (e.g. in c/b/ui/webui_browser) and should be a no-op as it has no views dependencies. Bug: 393144165 Change-Id: I68b43353ef185f017dfa33c557acae8b054a47f9 Bypass-Check-License: New files are just moved files. Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6866891 Auto-Submit: Paul Jensen Commit-Queue: Paul Jensen Reviewed-by: Elly FJ Reviewed-by: Georg Neis Cr-Commit-Position: refs/heads/main@{#1504323} --- app/command_utils_unittest.cc | 2 +- browser/ui/views/accelerator_table_unittest.cc | 3 ++- browser/ui/views/commands/default_accelerators_mac.h | 2 +- browser/ui/views/commands/default_accelerators_views.cc | 2 +- .../chrome/browser/ui/{views => }/accelerator_table.cc | 6 +++--- 5 files changed, 8 insertions(+), 7 deletions(-) rename chromium_src/chrome/browser/ui/{views => }/accelerator_table.cc (90%) diff --git a/app/command_utils_unittest.cc b/app/command_utils_unittest.cc index 7cea8827bee..1de04bba54e 100644 --- a/app/command_utils_unittest.cc +++ b/app/command_utils_unittest.cc @@ -10,7 +10,7 @@ #include "base/test/scoped_feature_list.h" #include "brave/components/commands/common/features.h" #include "chrome/app/chrome_command_ids.h" -#include "chrome/browser/ui/views/accelerator_table.h" +#include "chrome/browser/ui/accelerator_table.h" #include "testing/gtest/include/gtest/gtest.h" // Note: If this test fails because an accelerated command isn't present just diff --git a/browser/ui/views/accelerator_table_unittest.cc b/browser/ui/views/accelerator_table_unittest.cc index ec1a3e81a0c..4427f750543 100644 --- a/browser/ui/views/accelerator_table_unittest.cc +++ b/browser/ui/views/accelerator_table_unittest.cc @@ -3,10 +3,11 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at http://mozilla.org/MPL/2.0/. */ +#include "chrome/browser/ui/accelerator_table.h" + #include #include "brave/app/brave_command_ids.h" -#include "chrome/browser/ui/views/accelerator_table.h" #include "testing/gtest/include/gtest/gtest.h" namespace { diff --git a/browser/ui/views/commands/default_accelerators_mac.h b/browser/ui/views/commands/default_accelerators_mac.h index 76991af06a7..6675c127487 100644 --- a/browser/ui/views/commands/default_accelerators_mac.h +++ b/browser/ui/views/commands/default_accelerators_mac.h @@ -8,7 +8,7 @@ #include -#include "chrome/browser/ui/views/accelerator_table.h" +#include "chrome/browser/ui/accelerator_table.h" namespace commands { diff --git a/browser/ui/views/commands/default_accelerators_views.cc b/browser/ui/views/commands/default_accelerators_views.cc index 93832e27f94..89480e583c0 100644 --- a/browser/ui/views/commands/default_accelerators_views.cc +++ b/browser/ui/views/commands/default_accelerators_views.cc @@ -9,7 +9,7 @@ #include "base/containers/flat_set.h" #include "brave/browser/ui/commands/accelerator_service.h" #include "brave/browser/ui/commands/default_accelerators.h" -#include "chrome/browser/ui/views/accelerator_table.h" +#include "chrome/browser/ui/accelerator_table.h" #include "ui/base/accelerators/accelerator.h" #if BUILDFLAG(IS_MAC) diff --git a/chromium_src/chrome/browser/ui/views/accelerator_table.cc b/chromium_src/chrome/browser/ui/accelerator_table.cc similarity index 90% rename from chromium_src/chrome/browser/ui/views/accelerator_table.cc rename to chromium_src/chrome/browser/ui/accelerator_table.cc index 28fce207fac..b6fb208098c 100644 --- a/chromium_src/chrome/browser/ui/views/accelerator_table.cc +++ b/chromium_src/chrome/browser/ui/accelerator_table.cc @@ -1,9 +1,9 @@ /* Copyright (c) 2020 The Brave Authors. All rights reserved. * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this file, - * You can obtain one at http://mozilla.org/MPL/2.0/. */ + * You can obtain one at https://mozilla.org/MPL/2.0/. */ -#include "chrome/browser/ui/views/accelerator_table.h" +#include "chrome/browser/ui/accelerator_table.h" #include "base/containers/extend.h" #include "brave/app/brave_command_ids.h" @@ -11,7 +11,7 @@ #include "build/build_config.h" #define GetAcceleratorList GetAcceleratorList_ChromiumImpl -#include +#include #undef GetAcceleratorList namespace {