| Index: chrome/browser/gtk/accelerators_gtk.h
|
| diff --git a/chrome/browser/gtk/accelerators_gtk.h b/chrome/browser/gtk/accelerators_gtk.h
|
| index 1ea7ce42f466fb6eb0da711f7d89a41e103cb6e7..2e4570036bc10219e5032061686d3aa4a392fa54 100644
|
| --- a/chrome/browser/gtk/accelerators_gtk.h
|
| +++ b/chrome/browser/gtk/accelerators_gtk.h
|
| @@ -9,15 +9,17 @@
|
| #include "app/menus/accelerator_gtk.h"
|
| #include "base/hash_tables.h"
|
|
|
| +template <typename T> struct DefaultSingletonTraits;
|
| +
|
| class AcceleratorsGtk {
|
| public:
|
| - AcceleratorsGtk();
|
| - ~AcceleratorsGtk();
|
| -
|
| typedef std::vector<std::pair<int, menus::AcceleratorGtk> >
|
| AcceleratorGtkList;
|
| typedef AcceleratorGtkList::const_iterator const_iterator;
|
|
|
| + // Returns the singleton instance.
|
| + static AcceleratorsGtk* GetInstance();
|
| +
|
| const_iterator const begin() {
|
| return all_accelerators_.begin();
|
| }
|
| @@ -30,6 +32,11 @@ class AcceleratorsGtk {
|
| const menus::AcceleratorGtk* GetPrimaryAcceleratorForCommand(int command_id);
|
|
|
| private:
|
| + friend struct DefaultSingletonTraits<AcceleratorsGtk>;
|
| +
|
| + AcceleratorsGtk();
|
| + ~AcceleratorsGtk();
|
| +
|
| base::hash_map<int, menus::AcceleratorGtk> primary_accelerators_;
|
|
|
| AcceleratorGtkList all_accelerators_;
|
|
|