Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3479)

Unified Diff: chrome/browser/ui/webui/extensions/command_handler.cc

Issue 838253004: MacViews: Fix duplicate definition of ExtensionKeyBindingRegistry::SetShortcutHandlingSuspended (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@DragBookmarks2
Patch Set: Fix Mac Created 5 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/webui/extensions/command_handler.cc
diff --git a/chrome/browser/ui/webui/extensions/command_handler.cc b/chrome/browser/ui/webui/extensions/command_handler.cc
index b5504af398674094594f9ed2368c16e41c56bbac..79f942ab09ae694ea63b30d1ce303a680725f050 100644
--- a/chrome/browser/ui/webui/extensions/command_handler.cc
+++ b/chrome/browser/ui/webui/extensions/command_handler.cc
@@ -127,11 +127,8 @@ void CommandHandler::HandleSetShortcutHandlingSuspended(
const base::ListValue* args) {
bool suspended;
if (args->GetBoolean(0, &suspended)) {
- // Suspend/Resume normal shortcut handling.
- ExtensionKeybindingRegistry::SetShortcutHandlingSuspended(suspended);
-
- // Suspend/Resume global shortcut handling.
- ExtensionCommandsGlobalRegistry::SetShortcutHandlingSuspended(suspended);
+ ExtensionCommandsGlobalRegistry::Get(Profile::FromWebUI(web_ui()))->
+ SetShortcutHandlingSuspended(suspended);
}
}
« no previous file with comments | « chrome/browser/ui/views/extensions/extension_keybinding_registry_views.cc ('k') | ui/views/focus/focus_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698