chrome/browser/ui/views/location_bar/page_action_image_view.cc - Issue 10201016: Conflict detection for Extension Keybinding.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/views/location_bar/page_action_image_view.cc

Issue 10201016: Conflict detection for Extension Keybinding. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: Addressed comments 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:

Index: chrome/browser/ui/views/location_bar/page_action_image_view.cc

===================================================================

--- chrome/browser/ui/views/location_bar/page_action_image_view.cc (revision 134889)

+++ chrome/browser/ui/views/location_bar/page_action_image_view.cc (working copy)

@@ -6,6 +6,8 @@

#include "base/utf_string_conversions.h"

#include "chrome/browser/extensions/extension_browser_event_router.h"

+#include "chrome/browser/extensions/extension_command_service.h"

+#include "chrome/browser/extensions/extension_command_service_factory.h"

#include "chrome/browser/extensions/extension_context_menu_model.h"

#include "chrome/browser/extensions/extension_service.h"

#include "chrome/browser/extensions/extension_tab_util.h"

@@ -62,8 +64,10 @@

set_accessibility_focusable(true);

+ ExtensionCommandService* command_service =

+ ExtensionCommandServiceFactory::GetForProfile(browser_->profile());

const Extension::ExtensionKeybinding* page_action_command =

- extension->page_action_command();

+ command_service->GetActivePageActionCommand(extension->id());

if (page_action_command) {

keybinding_.reset(new ui::Accelerator(page_action_command->accelerator()));

owner_->GetFocusManager()->RegisterAccelerator(