chrome/browser/ui/views/toolbar/toolbar_view.cc - Issue 553243002: Track the active ExtensionKeybindingRegistry and make it available to EventRewriter.

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/toolbar/toolbar_view.cc

Issue 553243002: Track the active ExtensionKeybindingRegistry and make it available to EventRewriter. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@lkcr

Patch Set: Comment. Created 6 years, 3 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_keybinding_apitest.cc ('K') | « chrome/browser/ui/views/toolbar/toolbar_view.h ('k') | chrome/test/data/extensions/api_test/keybinding/chromeos_conversions/background.js » ('j') | chrome/test/data/extensions/api_test/keybinding/chromeos_conversions/manifest.json » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/views/toolbar/toolbar_view.cc

diff --git a/chrome/browser/ui/views/toolbar/toolbar_view.cc b/chrome/browser/ui/views/toolbar/toolbar_view.cc

index 573795fccd7857eeda603eeecd07b73870235446..3015092a8bb5c613b613e0132263cee4ff07d527 100644

--- a/chrome/browser/ui/views/toolbar/toolbar_view.cc

+++ b/chrome/browser/ui/views/toolbar/toolbar_view.cc

@@ -14,6 +14,7 @@

#include "chrome/app/chrome_command_ids.h"

#include "chrome/browser/chrome_notification_types.h"

#include "chrome/browser/command_updater.h"

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

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

#include "chrome/browser/profiles/profile.h"

#include "chrome/browser/themes/theme_service.h"

@@ -270,9 +271,25 @@ void ToolbarView::Init() {

void ToolbarView::OnWidgetVisibilityChanged(views::Widget* widget,

bool visible) {

- // Safe to call multiple times; the bubble will only appear once.

- if (visible)

+ extensions::ExtensionCommandsGlobalRegistry* registry =

+ extensions::ExtensionCommandsGlobalRegistry::Get(browser_->profile());

+ if (visible) {

+ // Safe to call multiple times; the bubble will only appear once.

extension_message_bubble_factory_->MaybeShow(app_menu_);

+ registry->set_active_registry(

Finnur 2014/09/12 11:25:44 Prefer line break above -- these code blocks are n

David Tseng 2014/09/12 23:18:33 Done.

+ browser_actions_->extension_keybinding_registry());

+ } else if (registry->active_registry() ==

+ browser_actions_->extension_keybinding_registry()) {

+ registry->set_active_registry(NULL);

+ }

+void ToolbarView::OnWidgetDestroyed(views::Widget* widget) {

+ extensions::ExtensionCommandsGlobalRegistry* registry =

+ extensions::ExtensionCommandsGlobalRegistry::Get(browser_->profile());

+ if (registry->active_registry() ==

+ browser_actions_->extension_keybinding_registry())

+ registry->set_active_registry(NULL);

}

void ToolbarView::Update(WebContents* tab) {