chrome/browser/ui/views/extensions/extension_installed_bubble.cc - Issue 10383240: This adds a webui overlay on the extensions page for showing what Extension keybindings are active.…

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/extensions/extension_installed_bubble.cc

Issue 10383240: This adds a webui overlay on the extensions page for showing what Extension keybindings are active.… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: Created 8 years, 7 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

« no previous file with comments | « chrome/browser/ui/views/browser_actions_container.cc ('k') | chrome/browser/ui/views/extensions/extension_keybinding_registry_views.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/views/extensions/extension_installed_bubble.cc

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

--- chrome/browser/ui/views/extensions/extension_installed_bubble.cc (revision 138124)

+++ chrome/browser/ui/views/extensions/extension_installed_bubble.cc (working copy)

@@ -146,11 +146,13 @@

switch (type_) {

case ExtensionInstalledBubble::BROWSER_ACTION: {

- ExtensionCommandService* command_service =

- ExtensionCommandServiceFactory::GetForProfile(

+ extensions::ExtensionCommandService* command_service =

+ extensions::ExtensionCommandServiceFactory::GetForProfile(

browser_->profile());

const extensions::Command* browser_action_command =

- command_service->GetActiveBrowserActionCommand(extension->id());

+ command_service->GetBrowserActionCommand(

+ extension->id(),

+ extensions::ExtensionCommandService::ACTIVE_ONLY);

if (!browser_action_command) {

info_ = new views::Label(l10n_util::GetStringUTF16(

IDS_EXTENSION_INSTALLED_BROWSER_ACTION_INFO));

@@ -168,11 +170,13 @@

break;

}

case ExtensionInstalledBubble::PAGE_ACTION: {

- ExtensionCommandService* command_service =

- ExtensionCommandServiceFactory::GetForProfile(

+ extensions::ExtensionCommandService* command_service =

+ extensions::ExtensionCommandServiceFactory::GetForProfile(

browser_->profile());

const extensions::Command* page_action_command =

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

+ command_service->GetPageActionCommand(

+ extension->id(),

+ extensions::ExtensionCommandService::ACTIVE_ONLY);

if (!page_action_command) {

info_ = new views::Label(l10n_util::GetStringUTF16(

IDS_EXTENSION_INSTALLED_PAGE_ACTION_INFO));