Make sure keybindings removed don't come back during extension update.

chrome/browser/extensions/api/commands/command_service.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/browser/extensions/api/commands/command_service.h"
 
 #include "base/lazy_instance.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/extensions/api/commands/commands.h"
 #include "chrome/browser/extensions/extension_function_registry.h"
 #include "chrome/browser/extensions/extension_keybinding_registry.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_system.h"
 #include "chrome/browser/prefs/scoped_user_pref_update.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/accelerator_utils.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/extensions/api/commands/commands_handler.h"
 #include "chrome/common/pref_names.h"
 #include "components/user_prefs/pref_registry_syncable.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_service.h"
 
 using extensions::Extension;
+using extensions::ExtensionPrefs;
 
 namespace {
 
 const char kExtension[] = "extension";
 const char kCommandName[] = "command_name";
 
+// A preference that indicates that the initial keybindings for the given
+// extension have been set.
+const char kInitialBindingsHaveBeenAssigned[] = "initial_keybindings_set";
+
 std::string GetPlatformKeybindingKeyForAccelerator(
     const ui::Accelerator& accelerator) {
   return extensions::Command::CommandPlatform() + ":" +
          UTF16ToUTF8(accelerator.GetShortcutText());
 }
 
+void SetInitialBindingsHaveBeenAssigned(
+    ExtensionPrefs* prefs, const std::string& extension_id) {
+  prefs->UpdateExtensionPref(extension_id, kInitialBindingsHaveBeenAssigned,
+                             Value::CreateBooleanValue(true));
+}
+
+bool InitialBindingsHaveBeenAssigned(
+    const ExtensionPrefs* prefs, const std::string& extension_id) {
+  bool assigned = false;
+  if (!prefs || !prefs->ReadPrefAsBoolean(extension_id,
+                                          kInitialBindingsHaveBeenAssigned,
+                                          &assigned))
+    return false;
+
+  return assigned;
+}
+
 }  // namespace
 
 namespace extensions {
 
 // static
 void CommandService::RegisterUserPrefs(PrefRegistrySyncable* registry) {
   registry->RegisterDictionaryPref(prefs::kExtensionCommands,
                                    PrefRegistrySyncable::SYNCABLE_PREF);
 }
 
@@ skipping 176 matching lines @@
 
   return ui::Accelerator();
 }
 
 void CommandService::AssignInitialKeybindings(const Extension* extension) {
   const extensions::CommandMap* commands =
       CommandsInfo::GetNamedCommands(extension);
   if (!commands)
     return;
 
+  ExtensionService* extension_service =
+      ExtensionSystem::Get(profile_)->extension_service();
+  ExtensionPrefs* extension_prefs = extension_service->extension_prefs();
+  if (InitialBindingsHaveBeenAssigned(extension_prefs, extension->id()))
+    return;
+  SetInitialBindingsHaveBeenAssigned(extension_prefs, extension->id());
+
   extensions::CommandMap::const_iterator iter = commands->begin();
   for (; iter != commands->end(); ++iter) {
     if (!chrome::IsChromeAccelerator(
         iter->second.accelerator(), profile_)) {
       AddKeybindingPref(iter->second.accelerator(),
                         extension->id(),
                         iter->second.command_name(),
                         false);  // Overwriting not allowed.
     }
   }
@@ skipping 122 matching lines @@
     return false;
 
   *command = *requested_command;
   if (shortcut_assigned.key_code() != ui::VKEY_UNKNOWN)
     command->set_accelerator(shortcut_assigned);
 
   return true;
 }
 
 }  // namespace extensions