OLD | NEW |
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "chrome/browser/profiles/profile.h" | 5 #include "chrome/browser/profiles/profile.h" |
6 #include "chrome/browser/ui/gtk/accelerators_gtk.h" | 6 #include "chrome/browser/ui/gtk/accelerators_gtk.h" |
7 #include "ui/base/accelerators/accelerator.h" | 7 #include "ui/base/accelerators/accelerator.h" |
8 | 8 |
9 namespace chrome { | 9 namespace chrome { |
10 | 10 |
11 bool IsChromeAccelerator(const ui::Accelerator& accelerator, Profile* profile) { | 11 bool IsChromeAccelerator(const ui::Accelerator& accelerator, Profile* profile) { |
12 AcceleratorsGtk* accelerators = AcceleratorsGtk::GetInstance(); | 12 AcceleratorsGtk* accelerators = AcceleratorsGtk::GetInstance(); |
13 for (AcceleratorsGtk::const_iterator iter = accelerators->begin(); | 13 for (AcceleratorsGtk::const_iterator iter = accelerators->begin(); |
14 iter != accelerators->end(); ++iter) { | 14 iter != accelerators->end(); ++iter) { |
15 if (iter->second.key_code() == accelerator.key_code() && | 15 if (iter->second.key_code() == accelerator.key_code() && |
16 iter->second.modifiers() == accelerator.modifiers()) | 16 iter->second.modifiers() == accelerator.modifiers()) |
17 return true; | 17 return true; |
18 } | 18 } |
19 | 19 |
20 return false; | 20 return false; |
21 } | 21 } |
22 | 22 |
| 23 ui::Accelerator GetPrimaryChromeAcceleratorForCommandId(int command_id) { |
| 24 AcceleratorsGtk* accelerators = AcceleratorsGtk::GetInstance(); |
| 25 const ui::Accelerator* accelerator = |
| 26 accelerators->GetPrimaryAcceleratorForCommand(command_id); |
| 27 |
| 28 return accelerator ? *accelerator : ui::Accelerator(); |
| 29 } |
| 30 |
23 } // namespace chrome | 31 } // namespace chrome |
OLD | NEW |