MacViews: Fix duplicate definition of ExtensionKeyBindingRegistry::SetShortcutHandlingSuspended

chrome/browser/ui/webui/extensions/command_handler.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/ui/webui/extensions/command_handler.h"
 
 #include "base/bind.h"
 #include "base/values.h"
 #include "chrome/browser/extensions/api/commands/command_service.h"
 #include "chrome/browser/extensions/extension_commands_global_registry.h"
@@ skipping 109 matching lines @@
   Profile* profile = Profile::FromWebUI(web_ui());
   CommandService* command_service = CommandService::Get(profile);
   if (command_service->SetScope(extension_id, command_name, global))
     UpdateCommandDataOnPage();
 }
 
 void CommandHandler::HandleSetShortcutHandlingSuspended(
     const base::ListValue* args) {
   bool suspended;
   if (args->GetBoolean(0, &suspended)) {
+    ExtensionCommandsGlobalRegistry* global_registry =
+        ExtensionCommandsGlobalRegistry::Get(Profile::FromWebUI(web_ui()));
+
     // Suspend/Resume normal shortcut handling.
-    ExtensionKeybindingRegistry::SetShortcutHandlingSuspended(suspended);
+    global_registry->registry_for_active_window()->

[Devlin, 2015/01/15 22:41:43]

nit: Should this maybe go into the ExtensionCommandsGlobalRegistry
implementation?  Is there any time we'd want to disable global, but not the
active window?

[Andre, 2015/01/16 18:40:15]

Done.

+        SetShortcutHandlingSuspended(suspended);
 
     // Suspend/Resume global shortcut handling.
-    ExtensionCommandsGlobalRegistry::SetShortcutHandlingSuspended(suspended);
+    global_registry->SetShortcutHandlingSuspended(suspended);
   }
 }
 
 void CommandHandler::GetAllCommands(base::DictionaryValue* commands) {
   base::ListValue* results = new base::ListValue;
 
   Profile* profile = Profile::FromWebUI(web_ui());
   CommandService* command_service = CommandService::Get(profile);
 
   const ExtensionSet& extensions =
@@ skipping 49 matching lines @@
     if (!extensions_list->empty()) {
       extension_dict->Set("commands", extensions_list.release());
       results->Append(extension_dict.release());
     }
   }
 
   commands->Set("commands", results);
 }
 
 }  // namespace extensions