| Index: extensions/common/message_bundle.cc
|
| diff --git a/extensions/common/message_bundle.cc b/extensions/common/message_bundle.cc
|
| index 2c387e1ad1659a06714e0e08f8d51a0478952846..ef78a0a7d5cc49f2c2e56a2b04f33f44d54450dc 100644
|
| --- a/extensions/common/message_bundle.cc
|
| +++ b/extensions/common/message_bundle.cc
|
| @@ -25,27 +25,26 @@ namespace extensions {
|
|
|
| namespace errors = manifest_errors;
|
|
|
| -const char* MessageBundle::kContentKey = "content";
|
| -const char* MessageBundle::kMessageKey = "message";
|
| -const char* MessageBundle::kPlaceholdersKey = "placeholders";
|
| +const char MessageBundle::kContentKey[] = "content";
|
| +const char MessageBundle::kMessageKey[] = "message";
|
| +const char MessageBundle::kPlaceholdersKey[] = "placeholders";
|
|
|
| -const char* MessageBundle::kPlaceholderBegin = "$";
|
| -const char* MessageBundle::kPlaceholderEnd = "$";
|
| -const char* MessageBundle::kMessageBegin = "__MSG_";
|
| -const char* MessageBundle::kMessageEnd = "__";
|
| +const char MessageBundle::kPlaceholderBegin[] = "$";
|
| +const char MessageBundle::kPlaceholderEnd[] = "$";
|
| +const char MessageBundle::kMessageBegin[] = "__MSG_";
|
| +const char MessageBundle::kMessageEnd[] = "__";
|
|
|
| // Reserved messages names.
|
| -const char* MessageBundle::kUILocaleKey = "@@ui_locale";
|
| -const char* MessageBundle::kBidiDirectionKey = "@@bidi_dir";
|
| -const char* MessageBundle::kBidiReversedDirectionKey =
|
| - "@@bidi_reversed_dir";
|
| -const char* MessageBundle::kBidiStartEdgeKey = "@@bidi_start_edge";
|
| -const char* MessageBundle::kBidiEndEdgeKey = "@@bidi_end_edge";
|
| -const char* MessageBundle::kExtensionIdKey = "@@extension_id";
|
| +const char MessageBundle::kUILocaleKey[] = "@@ui_locale";
|
| +const char MessageBundle::kBidiDirectionKey[] = "@@bidi_dir";
|
| +const char MessageBundle::kBidiReversedDirectionKey[] = "@@bidi_reversed_dir";
|
| +const char MessageBundle::kBidiStartEdgeKey[] = "@@bidi_start_edge";
|
| +const char MessageBundle::kBidiEndEdgeKey[] = "@@bidi_end_edge";
|
| +const char MessageBundle::kExtensionIdKey[] = "@@extension_id";
|
|
|
| // Reserved messages values.
|
| -const char* MessageBundle::kBidiLeftEdgeValue = "left";
|
| -const char* MessageBundle::kBidiRightEdgeValue = "right";
|
| +const char MessageBundle::kBidiLeftEdgeValue[] = "left";
|
| +const char MessageBundle::kBidiRightEdgeValue[] = "right";
|
|
|
| // Formats message in case we encounter a bad formed key in the JSON object.
|
| // Returns false and sets |error| to actual error message.
|
|
|