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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/ui/gtk/location_bar_view_gtk.cc

Issue 10201016: Conflict detection for Extension Keybinding. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 8 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
« chrome/browser/extensions/extension_service.cc ('K') | « chrome/browser/ui/gtk/extensions/extension_keybinding_registry_gtk.cc ('k') | chrome/browser/ui/views/browser_actions_container.cc » ('j') | chrome/common/extensions/extension.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/gtk/location_bar_view_gtk.cc
===================================================================
--- chrome/browser/ui/gtk/location_bar_view_gtk.cc (revision 133458)
+++ chrome/browser/ui/gtk/location_bar_view_gtk.cc (working copy)
@@ -25,6 +25,7 @@
#include "chrome/browser/content_settings/tab_specific_content_settings.h"
#include "chrome/browser/defaults.h"
#include "chrome/browser/extensions/extension_browser_event_router.h"
+#include "chrome/browser/extensions/extension_keybinding_registry.h"
#include "chrome/browser/extensions/extension_service.h"
#include "chrome/browser/extensions/extension_tab_util.h"
#include "chrome/browser/favicon/favicon_tab_helper.h"
@@ -1701,7 +1702,8 @@
window_ = owner_->browser()->window()->GetNativeHandle();
const Extension::ExtensionKeybinding* command =
- extension->page_action_command();
+ ExtensionKeybindingRegistry::GetActivePageActionCommand(
+ owner_->browser()->profile(), extension->id());
if (command) {
// Found the browser action shortcut command, register it.
keybinding_.reset(new ui::AcceleratorGtk(
« chrome/browser/extensions/extension_service.cc ('K') | « chrome/browser/ui/gtk/extensions/extension_keybinding_registry_gtk.cc ('k') | chrome/browser/ui/views/browser_actions_container.cc » ('j') | chrome/common/extensions/extension.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698