| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 #ifndef CHROME_BROWSER_UI_COCOA_ACCELERATORS_COCOA_H_ | 5 #ifndef CHROME_BROWSER_UI_COCOA_ACCELERATORS_COCOA_H_ |
| 6 #define CHROME_BROWSER_UI_COCOA_ACCELERATORS_COCOA_H_ | 6 #define CHROME_BROWSER_UI_COCOA_ACCELERATORS_COCOA_H_ |
| 7 | 7 |
| 8 #import <Cocoa/Cocoa.h> | 8 #import <Cocoa/Cocoa.h> |
| 9 | 9 |
| 10 #include <map> | 10 #include <map> |
| 11 #include <vector> | 11 #include <vector> |
| 12 | 12 |
| 13 #include "base/gtest_prod_util.h" | 13 #include "base/gtest_prod_util.h" |
| 14 #include "base/macros.h" |
| 14 #include "ui/base/accelerators/accelerator.h" | 15 #include "ui/base/accelerators/accelerator.h" |
| 15 | 16 |
| 16 namespace base { | 17 namespace base { |
| 17 template <typename T> | 18 template <typename T> |
| 18 struct DefaultSingletonTraits; | 19 struct DefaultSingletonTraits; |
| 19 } // namespace base | 20 } // namespace base |
| 20 | 21 |
| 21 // This class maintains a map of command_ids to Accelerator objects (see | 22 // This class maintains a map of command_ids to Accelerator objects (see |
| 22 // chrome/app/chrome_command_ids.h). Currently, this only lists the commands | 23 // chrome/app/chrome_command_ids.h). Currently, this only lists the commands |
| 23 // that are used in the App menu. | 24 // that are used in the App menu. |
| (...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 63 AcceleratorMap accelerators_; | 64 AcceleratorMap accelerators_; |
| 64 // A list of accelerators used in the main menu that have no associated | 65 // A list of accelerators used in the main menu that have no associated |
| 65 // command_id. The accelerator is fully filled out, and its | 66 // command_id. The accelerator is fully filled out, and its |
| 66 // platform_accelerator is also fully filled out. | 67 // platform_accelerator is also fully filled out. |
| 67 AcceleratorVector accelerator_vector_; | 68 AcceleratorVector accelerator_vector_; |
| 68 | 69 |
| 69 DISALLOW_COPY_AND_ASSIGN(AcceleratorsCocoa); | 70 DISALLOW_COPY_AND_ASSIGN(AcceleratorsCocoa); |
| 70 }; | 71 }; |
| 71 | 72 |
| 72 #endif // CHROME_BROWSER_UI_COCOA_ACCELERATORS_COCOA_H_ | 73 #endif // CHROME_BROWSER_UI_COCOA_ACCELERATORS_COCOA_H_ |
| OLD | NEW |