| OLD | NEW | 
|---|
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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_COMMON_EXTENSIONS_EXTENSION_H_ | 5 #ifndef CHROME_COMMON_EXTENSIONS_EXTENSION_H_ | 
| 6 #define CHROME_COMMON_EXTENSIONS_EXTENSION_H_ | 6 #define CHROME_COMMON_EXTENSIONS_EXTENSION_H_ | 
| 7 #pragma once | 7 #pragma once | 
| 8 | 8 | 
| 9 #include <algorithm> | 9 #include <algorithm> | 
| 10 #include <map> | 10 #include <map> | 
| (...skipping 122 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 133 | 133 | 
| 134   // An NaCl module included in the extension. | 134   // An NaCl module included in the extension. | 
| 135   struct NaClModuleInfo { | 135   struct NaClModuleInfo { | 
| 136     GURL url; | 136     GURL url; | 
| 137     std::string mime_type; | 137     std::string mime_type; | 
| 138   }; | 138   }; | 
| 139 | 139 | 
| 140   enum InputComponentType { | 140   enum InputComponentType { | 
| 141     INPUT_COMPONENT_TYPE_NONE = -1, | 141     INPUT_COMPONENT_TYPE_NONE = -1, | 
| 142     INPUT_COMPONENT_TYPE_IME, | 142     INPUT_COMPONENT_TYPE_IME, | 
| 143     INPUT_COMPONENT_TYPE_VIRTUAL_KEYBOARD, |  | 
| 144     INPUT_COMPONENT_TYPE_COUNT | 143     INPUT_COMPONENT_TYPE_COUNT | 
| 145   }; | 144   }; | 
| 146 | 145 | 
| 147   struct InputComponentInfo { | 146   struct InputComponentInfo { | 
| 148     // Define out of line constructor/destructor to please Clang. | 147     // Define out of line constructor/destructor to please Clang. | 
| 149     InputComponentInfo(); | 148     InputComponentInfo(); | 
| 150     ~InputComponentInfo(); | 149     ~InputComponentInfo(); | 
| 151 | 150 | 
| 152     std::string name; | 151     std::string name; | 
| 153     InputComponentType type; | 152     InputComponentType type; | 
| (...skipping 968 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 1122 | 1121 | 
| 1123   UpdatedExtensionPermissionsInfo( | 1122   UpdatedExtensionPermissionsInfo( | 
| 1124       const Extension* extension, | 1123       const Extension* extension, | 
| 1125       const ExtensionPermissionSet* permissions, | 1124       const ExtensionPermissionSet* permissions, | 
| 1126       Reason reason); | 1125       Reason reason); | 
| 1127 }; | 1126 }; | 
| 1128 | 1127 | 
| 1129 } // namespace extensions | 1128 } // namespace extensions | 
| 1130 | 1129 | 
| 1131 #endif  // CHROME_COMMON_EXTENSIONS_EXTENSION_H_ | 1130 #endif  // CHROME_COMMON_EXTENSIONS_EXTENSION_H_ | 
| OLD | NEW | 
|---|