| Index: chrome/browser/extensions/settings/settings_namespace.cc
|
| diff --git a/chrome/browser/extensions/settings/settings_namespace.cc b/chrome/browser/extensions/settings/settings_namespace.cc
|
| index 7340592468da90ee157d7b3831468f5d26225662..aa8c0070a9eceade80293ea69e5fd3ab3e3b3f88 100644
|
| --- a/chrome/browser/extensions/settings/settings_namespace.cc
|
| +++ b/chrome/browser/extensions/settings/settings_namespace.cc
|
| @@ -11,25 +11,29 @@ namespace extensions {
|
| namespace settings_namespace {
|
|
|
| namespace {
|
| -const char* kLocalNamespace = "local";
|
| -const char* kSyncNamespace = "sync";
|
| +const char kLocalNamespace[] = "local";
|
| +const char kSyncNamespace[] = "sync";
|
| +const char kManagedNamespace[] = "managed";
|
| } // namespace
|
|
|
| std::string ToString(Namespace settings_namespace) {
|
| switch (settings_namespace) {
|
| - case LOCAL: return kLocalNamespace;
|
| - case SYNC: return kSyncNamespace;
|
| - case INVALID:
|
| - default: NOTREACHED();
|
| + case LOCAL: return kLocalNamespace;
|
| + case SYNC: return kSyncNamespace;
|
| + case MANAGED: return kManagedNamespace;
|
| + case INVALID: break;
|
| }
|
| + NOTREACHED();
|
| return std::string();
|
| }
|
|
|
| Namespace FromString(const std::string& namespace_string) {
|
| if (namespace_string == kLocalNamespace)
|
| return LOCAL;
|
| - else if (namespace_string == kSyncNamespace)
|
| + if (namespace_string == kSyncNamespace)
|
| return SYNC;
|
| + if (namespace_string == kManagedNamespace)
|
| + return MANAGED;
|
| return INVALID;
|
| }
|
|
|
|
|