Chromium Code Reviews| Index: chrome/browser/ui/browser_commands.cc |
| diff --git a/chrome/browser/ui/browser_commands.cc b/chrome/browser/ui/browser_commands.cc |
| index b289ec114e1dd77b78f6e1ff53f46c4e65fa069c..3fede5f196902872d3730368624e40dce3564c4c 100644 |
| --- a/chrome/browser/ui/browser_commands.cc |
| +++ b/chrome/browser/ui/browser_commands.cc |
| @@ -748,10 +748,14 @@ void BookmarkCurrentPage(Browser* browser) { |
| const extensions::Extension* extension = NULL; |
| extensions::Command command; |
| extensions::CommandService::ExtensionCommandType command_type; |
| - if (GetBookmarkOverrideCommand(browser->profile(), |
| - &extension, |
| - &command, |
| - &command_type)) { |
| + |
| + // Bookmark command override for extensions will not be considered when user |
| + // selects bookmark icon for bookmarking a page by mouse. |
| + if (GetBookmarkOverrideCommand(browser->profile(), &extension, &command, |
| + &command_type) && |
| + !browser->command_controller() |
| + ->command_updater() |
| + ->get_bookmark_icon_selected()) { |
|
Finnur
2014/12/03 10:49:17
Mike Wittman implemented the Ctrl+D override for e
|
| switch (command_type) { |
| case extensions::CommandService::NAMED: |
| browser->window()->ExecuteExtensionCommand(extension, command); |