Conflict detection for Extension Keybinding.

chrome/common/extensions/extension.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/extension.h"
 
 #include "base/base64.h"
 #include "base/basictypes.h"
 #include "base/command_line.h"
 #include "base/file_path.h"
@@ skipping 313 matching lines @@
         errors::kInvalidKeyBinding,
         base::IntToString(index),
         platform_key,
         shortcut);
     return ui::Accelerator();
   }
 
   return ui::Accelerator(key, shift, ctrl, alt);
 }
 
+// static
+std::string Extension::ExtensionKeybinding::KeybindingPlatform() {
+#if defined(OS_WIN)
+  return values::kKeybindingPlatformWin;
+#elif defined(OS_MACOSX)
+  return values::kKeybindingPlatformMac;
+#elif defined(OS_CHROMEOS)
+  return values::kKeybindingPlatformChromeOs;
+#elif defined(OS_LINUX)
+  return values::kKeybindingPlatformLinux;
+#else
+  return "";
+#endif
+}
+
 bool Extension::ExtensionKeybinding::Parse(DictionaryValue* command,
                                            const std::string& command_name,
                                            int index,
                                            string16* error) {
   DCHECK(!command_name.empty());
 
   // We'll build up a map of platform-to-shortcut suggestions.
   std::map<const std::string, std::string> suggestions;
 
   // First try to parse the |suggested_key| as a dictionary.
@@ skipping 28 matching lines @@
     } else {
       *error = ExtensionErrorUtils::FormatErrorMessageUTF16(
           errors::kInvalidKeyBinding,
           base::IntToString(index),
           keys::kSuggestedKey,
           "Missing");
        return false;
     }
   }
 
-  std::string platform =
-#if defined(OS_WIN)
-      values::kKeybindingPlatformWin;
-#elif defined(OS_MACOSX)
-      values::kKeybindingPlatformMac;
-#elif defined(OS_CHROMEOS)
-      values::kKeybindingPlatformChromeOs;
-#elif defined(OS_LINUX)
-      values::kKeybindingPlatformLinux;
-#else
-      "";
-#endif
-
+  std::string platform = KeybindingPlatform();
   std::string key = platform;
   if (suggestions.find(key) == suggestions.end())
     key = values::kKeybindingPlatformDefault;
   if (suggestions.find(key) == suggestions.end()) {
     *error = ExtensionErrorUtils::FormatErrorMessageUTF16(
         errors::kInvalidKeyBindingMissingPlatform,
         base::IntToString(index),
         keys::kSuggestedKey,
         platform);
     return false;  // No platform specified and no fallback. Bail.
@@ skipping 3315 matching lines @@
     already_disabled(false),
     extension(extension) {}
 
 UpdatedExtensionPermissionsInfo::UpdatedExtensionPermissionsInfo(
     const Extension* extension,
     const ExtensionPermissionSet* permissions,
     Reason reason)
     : reason(reason),
       extension(extension),
       permissions(permissions) {}