* Remove #define in c/b/ui/accelerator_table.cc Replaces #define macro with plaster + chromium_src override. plaster will rename GetAcceleratorList() to GetAcceleratorList_ChromiumImpl() so that we can have our own implementation of GetAcceleratorList().
14 lines
616 B
Diff
14 lines
616 B
Diff
diff --git a/chrome/browser/ui/accelerator_table.cc b/chrome/browser/ui/accelerator_table.cc
|
|
index 51837acdf5a13e6ae75e163943d977c85c6c7fd1..234c5d6a24808f0734411e8398f179f1283060b2 100644
|
|
--- a/chrome/browser/ui/accelerator_table.cc
|
|
+++ b/chrome/browser/ui/accelerator_table.cc
|
|
@@ -305,7 +305,7 @@ std::vector<AcceleratorMapping>* GetAcceleratorsPointer() {
|
|
|
|
} // namespace
|
|
|
|
-std::vector<AcceleratorMapping> GetAcceleratorList() {
|
|
+std::vector<AcceleratorMapping> GetAcceleratorList_ChromiumImpl() {
|
|
std::vector<AcceleratorMapping>* accelerators = GetAcceleratorsPointer();
|
|
|
|
if (accelerators->empty()) {
|