Move the rest of extension_manifest_constants to top-level extensions/

chrome/common/extensions/command.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/common/extensions/command.h"
 
 #include "base/logging.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_split.h"
 #include "base/strings/string_util.h"
 #include "base/values.h"
 #include "chrome/common/extensions/extension.h"
-#include "chrome/common/extensions/extension_manifest_constants.h"
 #include "extensions/common/error_utils.h"
+#include "extensions/common/manifest_constants.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 
-namespace errors = extension_manifest_errors;
-namespace keys = extensions::manifest_keys;
-namespace values = extension_manifest_values;
+namespace extensions {
 
-using extensions::ErrorUtils;
-using extensions::Command;
+namespace errors = manifest_errors;
+namespace keys = manifest_keys;
+namespace values = manifest_values;
 
 namespace {
 
 static const char kMissing[] = "Missing";
 
 static const char kCommandKeyNotSupported[] =
     "Command key is not supported. Note: Ctrl means Command on Mac";
 
 bool IsNamedCommand(const std::string& command_name) {
   return command_name != values::kPageActionCommandEvent &&
@@ skipping 210 matching lines @@
     if (tokens[i] == values::kKeyCtrl)
       tokens[i] = values::kKeyCommand;
     else if (tokens[i] == values::kKeyMacCtrl)
       tokens[i] = values::kKeyCtrl;
   }
   return JoinString(tokens, '+');
 }
 
 }  // namespace
 
-namespace extensions {
-
 Command::Command() {}
 
 Command::Command(const std::string& command_name,
                  const string16& description,
                  const std::string& accelerator)
     : command_name_(command_name),
       description_(description) {
   string16 error;
   accelerator_ = ParseImpl(accelerator, CommandPlatform(), 0,
                            IsNamedCommand(command_name), &error);
@@ skipping 252 matching lines @@
   extension_data->SetString("description", command_description);
   extension_data->SetBoolean("active", active);
   extension_data->SetString("keybinding", accelerator().GetShortcutText());
   extension_data->SetString("command_name", command_name());
   extension_data->SetString("extension_id", extension->id());
 
   return extension_data;
 }
 
 }  // namespace extensions